Fixed build break
Merge branch 'develop' of github.com:CloudifySource/cosmo-messaging into develop