CFY-606 fix flake
CFY-606 fix format
CFY-606 fix flake
Merge pull request #89 from cloudify-cosmo/feature/CFY-606-final-fixes

Feature/cfy 606 final fixes