Merge proposals dependent on lp:~canonical-platform-qa/autopilot/ap-eventually-exception-fix

1. ap-eventually-exception-fix
2. Dependent merge proposals