Merge branch 'hotfix/1.21.16' into stable
1.21.17
reset GEM_HOME only when reseting PATH after no .rvmrc found, fix #2089
Merge branch 'hotfix/1.21.17'