CLOUDIFY-2528 flake8
CLOUDIFY-2528 revert branch to develop