Removed hacks to overcome wasync bugs. They
Merge branch 'develop' of https://github.com/CloudifySource/cosmo-messaging into develop