A few small bug fixes
Finished feature 54037051/wrapper-uninstall.

Conflicts:
	code/firefox/js/state.js
	tests/test-suite-extension/manifest.json