Travis-CI builds fail with BootstrapSettings.Holder cannot be initialized error

This is an attempt to fix this
Merge branch 'travis-test-failures-fix'