Bug 846854: make sure that private window is focused when doing testWindowIteratorPrivateDefault
Bug 838981: Ignore private window in tabs API when addon doesn't have private-browsing permission.
Bug 847418: Do not ship with manifest entries for SDK modules.
Merge pull request #829 from erikvold/846854p2

Bug 846854: make sure that private window is focused when doing testWindowIteratorPrivateDefault r=@Mossop
Merge pull request #831 from ochameau/sdk-entries

Bug 847418: Do not ship with manifest entries for SDK modules. r=@gozala
Bug 847785 - Update template for unit tests to the current require() usage statements
Merge pull request #832 from KWierso/bug847785

Bug 847785 - Update template for unit tests to the current require() usage statements r=@ochameau
Merge pull request #830 from ochameau/tabs-pb

Bug 838981: Ignore private window in tabs API when addon doesn't have private-browsing permission. r=@gozala
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	test/addons/private-browsing-supported/main.js