CLOUDIFY-2340 fix flake8 violations after merge