Merge proposals dependent on lp:~thomir-deactivatedaccount/autopilot/trunk-add-wait-for-destroy

1. trunk-add-wait-for-destroy
2. Dependent merge proposals