Merge branch 'hotfix/1.20.11'
remove curl's --progress-bar to fix https://github.com/fnichol/chef-rvm/issues/136
fix detecting java for jruby on centos like systems, fix #1919
1.20.12
Merge branch 'master' into hotfix/1.20.12
Merge branch 'hotfix/1.20.12' into stable