CFY-1455 fixed bug from previous commit
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-plugins-common