Import recent changes from jenkinsci/rbenv-plugin v0.0.16