Ruby 2.5 fixes

Created by: myronmarston

This should get our test suite to green on Ruby 2.5. Note that https://bugs.ruby-lang.org/issues/14045 introduces a regression in RSpec (see my comment on note #5 (closed)) so we'll probably need to backport this to the 3-7-maintenance branch and cut a release.