Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/demo_server-fatal-errors-core-dump

1. demo_server-fatal-errors-core-dump
2. Dependent merge proposals