ml5174: merge latest cloudbees updates
Merge origin/master