Merge proposals dependent on lp:~cjohnston/summit/bug-644039

lp:~cjohnston/summit/bug-644039 has no merge proposals.