* stable-2.13: Fix cyclic dependency when using site_path from system_config table Change-Id: I519ee80c35190e1fe08d88522cbe64e464a44513