Revert "Revert "Bug 717062 - Root preferences branch for simple-prefs needs to be configurable r=@erikvold""

This reverts commit 3784678ed07b074295bacd7d67ca259b043c0b8c.
Bug 717062 exposing require("sdk/self").preferencesBranch
Bug 926727 Detraitify worker
Bug 951950 Fix tests that don't run on Fennec, fix event/core iterating over invalid properties (localStorage) for Fennec's tab which accepts a window
Bug 903032 removing docs related python
Merge branch 'master' of github.com:mozilla/addon-sdk into 717062v2
Bug 717062 Adding regression test
Merge pull request #1340 from jsantell/fix-fennec-tests

Fix Bug 951950 Fix tests that don't run on Fennec, r=@erikvodl
Merge pull request #1265 from jsantell/detraitify-worker

Fix Bug 926727 Detraitify worker, r=@erikvold
Bug 959142 - Jetpack permanent orange on holly because of reliance on CustomizableUI.jsm import

- Added check for `CustomizableUI` in the UI modules
Fix global 'addon' on trusted content by adding back contentURL to workers, broke from worker detraitification
Merge pull request #1346 from jsantell/959433-fix-worker-addon-global

Fix Bug 959433 Fix global 'addon' on trusted content, r=@erikvold
Merge pull request #1344 from ZER0/holly/959142

Bug 959142 - Jetpack permanent orange on holly because of reliance on CustomizableUI.jsm import r=@erikvold
Bug 956626 - Convert periods to text in widget IDs. r=zer0
Bug 958908 - Remove usage of deprecated/observer-service
Merge branch 'master' of github.com:mozilla/addon-sdk into 958908

Conflicts:
	lib/sdk/content/worker.js
	lib/sdk/deprecated/symbiont.js
Merge pull request #1343 from erikvold/958908

Bug 958908 - Remove usage of deprecated/observer-service r=@jsantell
Bug 793266: Remove app-strings and api-utils#publicConstructor
Merge pull request #1348 from jsantell/793266-remove-app-strings-andpublic-constructor

Fix Bug 793266: Remove app-strings and api-utils#publicConstructor, r=@erikvold
Merge pull request #1333 from jryans/button-view-id

fix Bug 956626 - Convert periods to text in widget IDs r=@ZER0