Mir

Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/0.17-display-config-fixes

  1. 0.17-display-config-fixes
  2. Dependent merge proposals

lp://qastaging/~alan-griffiths/mir/0.17-display-config-fixes has no merge proposals.