cherry-pick 7ef39b3dbe01fed4c5a893895153d8d27b4eca74 (#922)
cherry-pick 7ef39b3dbe01fed4c5a893895153d8d27b4eca74 (#922)


cloudify-cosmo/cloudify-manager,cloudify-cosmo/cloudify-manager,cloudify-cosmo/cloudify-manager