Mistaken pep8 breakage, from bad merge

--HG--
extra : rebase_source : ed5890c32c6b6e327caf32dd1675fcf7351d955c
Backed out changeset a502272922e4
Backed out changeset 3943c00bb047
I broke manage_masters, rather than fix-in-place, backout since release-runner depends on it. r=bustage