Unregister the exchange type when the plugin is disabled (at runtime)
Switch to simplified boot/cleanup step API
Merge bug 24926