apply nir0s patch manually
Merge branch 'master' of github.com:cloudify-cosmo/getcloudify.org