Merge "Jenkins changes for Policy CSIT frankfurt breakage"