Rename GM:terminate/2 to GM:handle_terminate/2 so that it doesn't conflict with the same callback in gen_server.
Split mirrored_supervisor_tests in two to avoid behaviour clash.
Merge in default
Move actual supervisor definitions out to avoid conflicting behaviours in a module.
Merge bug 26378