CFY-1196 fix import due to cli changes
Merge pull request #4 from cloudify-cosmo/CFY-1196-cli-refactor

CFY-1196 fix import due to cli changes