Merge proposals dependent on lp:~cjohnston/ubuntu-classroom/help-update

lp:~cjohnston/ubuntu-classroom/help-update has no merge proposals.