Merge proposals dependent on lp://qastaging/~veebers/cupstream2distro-config/fix_autopilot_config

1. fix_autopilot_config
2. Dependent merge proposals