Mir

Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/raii-fix-1237710

lp://qastaging/~alan-griffiths/mir/raii-fix-1237710 has no merge proposals.