CFY-996 changed cloudify-cli to cloudify
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-openstack-provider