Code review comment for ~cjwatson/launchpad-mojo-specs:git-bump-maxconn

I've landed Haw's changes and rebased this against them - there are still a few things left as cowboys on production, so I'll land this to resolve those.