Merge pull request #2650 from dsander/fix-travis-build

Fix TravisCI build

.travis.yml

@@ -6,8 +6,7 @@ services:
   - mysql
   - postgresql
 before_install:
-  - gem update --system
-  - gem install bundler
+  - gem install bundler -v '< 2' --conservative --force
 env:
   global:
     - APP_SECRET_TOKEN=b2724973fd81c2f4ac0f92ac48eb3f0152c4a11824c122bcf783419a4c51d8b9bba81c8ba6a66c7de599677c7f486242cf819775c433908e77c739c5c8ae118d