CFY-1196 minor fixes
CFY-1195 fix tests
Merge pull request #62 from cloudify-cosmo/CFY-1196-cli-refactor

CFY-1196 minor fixes