Merge "Update to pmsh jjb job"