Merge "patch jenkins jobs for opa-pdp"