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

CFY-606 fix flake