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