CFY-1196 fix cfy usage in system tests
Merge pull request #46 from cloudify-cosmo/CFY-1196-cli-refactor

CFY-1196 fix cfy usage in system tests