CLOUDIFY-2340 small flake8 related fixes