Merge proposals dependent on lp:~veebers/autopilot/fix_1178014

lp:~veebers/autopilot/fix_1178014 has no merge proposals.