CFY-606 fix flake
CFY-606 merge entire env
Merge pull request #99 from cloudify-cosmo/feature/CFY-606-final-fixes

Feature/cfy 606 final fixes