[BACKLOG-207] - Moving blocking of startup to a lifecycle listener
Merge pull request #1 from brosander/BACKLOG-207

[BACKLOG-207] - Moving blocking of startup to a lifecycle listener
[BACKLOG-207] - Refactoring and adding unit tests
Merge pull request #2 from brosander/BACKLOG-207

[BACKLOG-207] - Refactoring and adding unit tests
[BACKLOG-207] - Refactoring, unit tests
Merge pull request #3 from brosander/BACKLOG-207

[BACKLOG-207] - Refactoring, unit tests