Add support for JPM.
Remove ID and add engines to be compatible with jpm.
Bug 983277 - Intermittent test-ui-sidebar.testSidebarLeakCheckUnloadAfterAttach

Opening a new window for this test to be more certain previous tests do not affect it.
Bug 993029: Tag the SDK console with the add-on ID.
Bug 1005488 - Deprecate sdk/content/content
bug 1004833 - enable e10s argument and flag

plus a new e10s test addon
Merge pull request #1484 from zombie/e10s-cfx-flag

bug 1004833 - enable e10s argument and flag, r=@gozala
Bug 851145 - Refactor isPrivate method to use the method module
Merge pull request #1471 from erikvold/851145

Bug 851145 - Refactor isPrivate method to use the method module r=@gozala
Merge pull request #1479 from Mossop/bug993029

Bug 993029: Tag the SDK console with the add-on ID. r=gozala
Bug 999585 - wantExportHelpers for all content-script. r=Mossop
Merge pull request #1482 from jsantell/1005488-remove-content-content

Fix Bug 1005488 - Deprecate sdk/content/content, r=@zombie
bug 1006043 - hack around lingering child process
Merge pull request #1485 from zombie/1006043-double-kill

bug 1006043 - hack around lingering child process, r=@Mossop
Bug 1010344.  Don't do deep compares on window objects in addon SDK tests, since that's not a very useful thing to do and can go into infinite loops.  r=mossop
Bug 810654: Added 'exclude' option to PageMods.
Merge pull request #1489 from cbrem/master

Bug 810654 Added 'exclude' option to PageMod., r=@jsantell
bug 903039 - jetpack native options

- work without changing bootstrap.js
- add validate, type and caching tests
- exhaustive and irregular style guide
- test addon disable
- Revert "test addon disable"
Merge pull request #1368 from zombie/903039-native-options

bug 903039 - jetpack native options, r=@erikvold
Revert "Merge pull request #1368 from zombie/903039-native-options"

This reverts commit c73d7c97183ddb2130f60849fda526e042d5d0eb, reversing
changes made to c49118aa60fcf959534e25f4eed45fd4504db316.