Merge "Fix jenkins master merge job"