Merge "Bug 4284 - PolicyEnforcer could not find CI"