bug 1089237 - keep strong reference to bound observer method
Make shared require use rootURI it's loaded from.
Merge pull request #1686 from zombie/1089237-test-worker-history

bug 1089237 - keep strong reference to bound observer method, r=@Mossop
bug 1089238 - use test/httpd to simulate readyState timings
Merge pull request #1685 from zombie/1089238-testContentScriptWhen

bug 1089238 - use test/httpd to simulate readyState timings, r=@erikvold
Bug 1091364 - Unpacked add-on tests do not run with jpm
bug 1090147 - switch tab.attach to use async Worker
Merge pull request #1690 from zombie/1090147-tab-attach

bug 1090147 - switch tab.attach to use async Worker, r=@Mossop
Bug 1077372 - When a jpm add-on depends on addon-pathfinder then jpm test fails to run the pathfinder tests r=jsantell
Merge pull request #1691 from erikvold/1091364

Bug 1091364 - Unpacked add-on tests do not run with jpm r=@jsantell
Merge pull request #1687 from Gozala/shared-require-test@1070927

Bug 1070927 - Make shared require use rootURI it's loaded from.
bug 1092231 - fix traits to work with Symbols
Merge pull request #1694 from zombie/1092231-symbol-iterator

bug 1092231 - fix traits to work with Symbols, r=@Gozala
Fix tests.
Merge pull request #1697 from Gozala/bug/symbol-iterator@1093032

Bug 1093032 - Fix regressions caused by Symbol.iterator r=@Mossop
Temporarily remove content-permissions test add-on till Bug 1094068 is fixed. a=@gozala
openToolbox() should accept non-function objects
openToolboxPanel() should also accept non-function objects (#1688).
Merge remote-tracking branch 'florent/master'

Conflicts:
	lib/dev/utils.js