Merge branch 'ss/travis-ci-force-vm-mode' into maint

The "container" mode of TravisCI is going away. Our .travis.yml file is getting prepared for the transition. * ss/travis-ci-force-vm-mode: travis-ci: no longer use containers