Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/discussion-migrate-demo-shell

1. discussion-migrate-demo-shell
2. Dependent merge proposals