updating settings php on master
Merge branch 'release/7.x-2.1'
Merge branch 'hotfix/7.x-2.6'
Merge branch 'release/7.x-2.7'
Merge branch 'master' of svn-634.devcloud.hosting.acquia.com:decoop
Merge branch 'release/7.x-2.8'
Fix up TravisCI to run Behat
Merge branch 'hotfix/7.x-2.9' into develop