Merge proposals dependent on lp:~nskaggs/autopilot/fix-state-verbiage

lp:~nskaggs/autopilot/fix-state-verbiage has no merge proposals.