Merge proposals dependent on lp:~michael.nelson/ubuntu-webcatalog/fix-admin-template

lp:~michael.nelson/ubuntu-webcatalog/fix-admin-template has no merge proposals.