CFY-977 changed cloudify-cli dep to cloudify
modified image id and name
Merge branch 'master' into CFY-972-DSL-alignment-with-tosca