Merge proposals dependent on lp:~jtv/launchpad/more-pre-791204-lint

lp:~jtv/launchpad/more-pre-791204-lint has no merge proposals.