Merge "Fix pep8 violations in cluster-deployer (2/3)"