Return the deferred so that we can use it for other things
Add tests for AbstractBootstrapper
pep8 fixes
Merge remote-tracking branch 'chiiph/feature/add_abstractbootstrapper_test' into develop