Minor fixes to startup
Handle location allocation and closing
Merge branch 'locations' of https://github.com/cloudsoft/brooklyn-waratek into locations