Merge "Fixed Jenkins master configuration enforcing"