Merge proposals dependent on lp:~mako/ubuntu-codeofconduct/proposed-revision

lp:~mako/ubuntu-codeofconduct/proposed-revision has no merge proposals.