Improvements on availability
Merge branch 'master' of https://github.com/sindremb/cloudbrokermodel