Sorting out Gemfile

This change is another attempt to sort out the Gemfile/debug/Ruby 2.0
interaction.

[#59911894]
Merge 59911894-test-fixes to master

[Completes #59911894]