Merge proposals dependent on lp:~allanlesage/helipad/test-fixes

lp:~allanlesage/helipad/test-fixes has no merge proposals.