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