Merge proposals dependent on lp://qastaging/~sil2100/unity/autopilot_fix_cmd_locale

lp://qastaging/~sil2100/unity/autopilot_fix_cmd_locale has no merge proposals.