Merge "fix jenkins staing jobs with policy agent image"