Revert "Temporarily remove content-permissions test add-on till Bug 1094068 is fixed. a=@gozala"

This reverts commit 07c466d8dc061c511627c517ed95b555a4c0cf73.
Bug 1089236: Disabel failing tests.
bug 1090135 - use nsIDOMWindowUtils::loadSheetUsingURIString
Merge pull request #1693 from zombie/1090135-loadSheet

bug 1090135 - use nsIDOMWindowUtils::loadSheetFromURIString(), r=@Mossop
Bug 1094392: Don't claim page-mods are weak referential when we already hold a strong reference to them.
Merge pull request #1701 from Mossop/bug1094392_2

Bug 1094392: Don't claim page-mods are weak referential when we already hold a strong reference to them. r=zombie
Bug 1083068 - Improve SDK logging when a promise is rejected during tests. r=gozala
bug 1095012 - explicitly disable e10s when not desired
Bug 1092882 - preferences/service should utilize Preferences.jsm
Bug 1023661 - Add support for SeaMonkey to "places" modules
Merge pull request #1702 from zombie/1095012-ci-e10s

bug 1095012 - explicitly disable e10s when not enabled for testing, r=@Mossop
Bug 1095583 - assert.throws should catch thrown strings
Merge pull request #1704 from erikvold/1092882

Bug 1092882 - preferences/service should utilize Preferences.jsm r=@jsantell
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 1095583

Conflicts:
	lib/sdk/test/assert.js
Merge pull request #1705 from erikvold/1095583

Bug 1095583 - assert.throws should catch thrown strings r=@jsantell
Revert "Merge pull request #1704 from erikvold/1092882"

This reverts commit bced24ac402caf08633666f2f651ebc35c8002d0, reversing
changes made to 0d0cd533be3962d00dd7fe248e8574baa056cc9f.

Conflicts:
	lib/sdk/test/assert.js
Merge pull request #1703 from fred-wang/seamonkey-places

Bug 1023661 - Add support for SeaMonkey to "places" modules r=erikvold
Bug 1023661 - make window/utils.js use the 'browser.chromeURL' preference instead of 'chrome://browser/content/browser.xul'. r=erikvold
Bug 1023661 - Declare some low-level modules compatible with SeaMonkey. r=erikvold
Merge pull request #1707 from fred-wang/seamonkey-lowlevel

Bug 1023661 - Declare some low-level modules compatible with SeaMonkey r=erikvold