Merge proposals dependent on lp:~cjohnston/loco-team-portal/bug-611897

lp:~cjohnston/loco-team-portal/bug-611897 has no merge proposals.