Workaround bundler issues
Merge pull request #589 from fabianofranz/bugs/travis-1.1-broken

Merged by openshift-bot
Bug 1079165 - added warning when removing external cart with zero gears
Merge pull request #590 from fabianofranz/bugs/1079165

Merged by openshift-bot