merge revision(s) 19c39e4c, d78ff6a7: [Backport #20984] [Bug #20984] ENV.inspect should be encoding aware [Bug #20984] Fix test with locale encoding