CLOUDIFY-2340 flake8 changes
Merge pull request #1 from CloudifySource/feature/CLOUDIFY-2340-flake8

Conform to flake8