[traveling-bosh] loosen constraints so don't need to rebase as much
merge clean-bundler/loosen-constraints branch