Fix build break
Merge branch 'develop' of https://github.com/CloudifySource/cosmo-manager into develop