Merge from jenkinsci/jclouds-plugin to master branch