Merge proposals dependent on lp:~coreygoldberg/autopilot/fix-tests-1281733

lp:~coreygoldberg/autopilot/fix-tests-1281733 has no merge proposals.