Bug 921845 - Ensure unregistering the simulator on disabling/uninstallating
Merge pull request #853 from ochameau/unregister

Bug 921845 - Ensure unregistering the simulator on disabling/uninstallating