Merge proposals dependent on lp:~thumper/launchpad/fix-browser-zcml

lp:~thumper/launchpad/fix-browser-zcml has no merge proposals.