Revert "Revert "Merge pull request #1704 from erikvold/1092882""

This reverts commit 3c9bbbe41382d3ba30ac6d10cab06eaa20427998.
Bug 1092882 - bug fix: setting a pref to undefined now returns a slightly different, more specific error now a=erikvold
Bug 1097874 assert.throws expected value is messy when a reg exp is used
Merge pull request #1709 from erikvold/1097874

Bug 1097874 assert.throws expected value is messy when a reg exp is used r=@jsantell
Bug 1092477 - Let the subscript Loader report any URL it fails on, when it can. r=bholley
Merge pull request #1708 from erikvold/1092882

Bug 1092882 - preferences/service should utilize Preferences.jsm r=jsantell
Bug 1098946 - Expose "activate" and "deactivate" for windows & browsers. r=erikvold

Conflicts:
	test/test-window-events.js
Merge pull request #1714 from erikvold/1098946

Bug 1098946 - Expose "activate" and "deactivate" for sdk/window/events r=erikvold
Revert "Merge pull request #1714 from erikvold/1098946"

This reverts commit f1fed2c95c877d195f416c4f02517345f975255b, reversing
changes made to 240f5de953bf4b09d9ef2497d4bc23bd49415b40.
Bug 1060138: Fix context-menu to work in e10s. r=zombie
Bug 1100639 - Remove support for Sunbird. r=erikvold
Merge pull request #1715 from fred-wang/sunbird

Bug 1100639 - Remove support for Sunbird. r=erikvold
Merge branch 'master' into 1097918