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

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