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

CFY-1196 fix import due to cli changes