Merge pull request #811 from ochameau/overload-mobile

Bug 844409: Implement proper support of --overload-modules for mobile. r=@gozala(cherry picked from commit e91251e4348b3f6baf6303b0653eda64661d66be)
Bug 846169: Display a message that tbpl will recognise for test timeouts when in parseable output mode. r=ochameau
(cherry picked from commit b81ddb118d8c4964759b8a5da870e24ac36e9b4c)
Merge pull request #831 from ochameau/sdk-entries

Bug 847418: Do not ship with manifest entries for SDK modules. r=@gozala(cherry picked from commit 6f0f31839ac5111f461aabe48f2ff48a50ded206)

Conflicts:

	test/private-browsing/windows.js
Merge pull request #832 from KWierso/bug847785

Bug 847785 - Update template for unit tests to the current require() usage statements r=@ochameau(cherry picked from commit b0f21bbb646e6e9f2185a467cdec14a7fc73754b)
Merge pull request #763 from erikvold/820582

Fix Bug 820582 adding private-browsing flag to package.json r=@Gozala
Conflicts:

	test/test-private-browsing.js
Merge pull request #736 from erikvold/828746

Fix Bug 828746 add isPrivate method to private-browsing module r=@gozala
Conflicts:

	test/private-browsing/windows.js
	test/test-private-browsing.js
Merge pull request #792 from erikvold/839718

Fix Bug 839718: isPrivate works on Fennec r=@Gozala(cherry picked from commit 682a69c089b37059f9a21c5092ad4d6ed9929dc1)

Conflicts:

	test/test-private-browsing.js
Merge pull request #797 from erikvold/840014

Fix Bug 840014: tabs.open() and windows.open() now take a isPrivate option r=@Gozala(cherry picked from commit ac63592a80d6d316b52b51941434e15feadb0699)
Merge pull request #816 from ochameau/hooked-console

Bug 845549 - Expose an helper to ease testing console output in tests r=@erikvold(cherry picked from commit c1e40cd69bbf76a2b0b288d3f3c8e3315fdcdd67)

Conflicts:

	test/test-deprecate.js
	test/test-system-events.js
Merge pull request #817 from ochameau/window-isprivate

bug 842448 - Deprecate window.isPrivateBrowsing in favor of require('private-browsing').isPrivate() r=@erikvold(cherry picked from commit e20fb10400ed3a13510d251b1b8fafa6b4eed6f2)
Merge pull request #825 from erikvold/834961-2

Fix Bug 834961 - pwpb update window modules to ignore private windows r=@gozala

(cherry picked from commit bb69f6051e88b24bb8993c2a5016b91f278efcda)

Conflicts:

	lib/sdk/tabs/utils.js
	test/private-browsing/windows.js
Merge pull request #827 from erikvold/834961-fix

Bug 834961: fixes for the private-browsing test add-on a=@Gozala(cherry picked from commit 3c87ada3cb75c13063f126fdc1ad4afc257b91e6)
Merge pull request #829 from erikvold/846854p2

Bug 846854: make sure that private window is focused when doing testWindowIteratorPrivateDefault r=@Mossop

(cherry picked from commit fb5726df254dc4d63bc05c7fde67badfb6659a5a)

Conflicts:

	test/windows/test-firefox-windows.js
Merge pull request #828 from erikvold/846854p1

Bug 846854: making sure that activeWindow getters have the expected window r=@Mossop

(cherry picked from commit 118e3d429473d5f68ae97fd7a61fce592de3e133)

Conflicts:

	test/windows/test-firefox-windows.js
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(cherry picked from commit a9345e76f37155b32dfb8d6d25ea4df5b7f1e18f)
Merge pull request #835 from erikvold/846856

Fix Bug 846856 - TEST-UNEXPECTED-FAIL | tests/test-window-utils-private-browsing.testSettingActiveWindowIgnoresPrivateWindow | Correct active window [1] r=@ochameau(cherry picked from commit d92a2da7e742bd76fd50a416b5d0c60dc9e7f39c)
Merge pull request #793 from erikvold/784224-2

Fix Bug 784224: Page-mod tests now work on Fennec r=@ochameau(cherry picked from commit 133c45791de94125e39b98aa11e3d8a9153e0153)

Conflicts:
	lib/sdk/tabs/utils.js
	test/test-page-mod.js
Merge pull request #772 from ochameau/page-mod-pb

Bug 834960: Ignore private document unless addon explicitely support private browsing r=@erikvold(cherry picked from commit 424f66c3663d8d507407952ac8586ab4bc809396)
Merge pull request #857 from ZER0/private-selection2/834958

Fix Bug 834958 - pwpb update selection module to ignore private windows r=@erikvold(cherry picked from commit a0f371fdf21a691186ad7da540f3bdb87079ee3c)
Merge pull request #853 from erikvold/845387

Bug 845387: private-browsing isPrivate should take a content script instance(cherry picked from commit 86d1660710cd4436c8e076a4142ddfc923af4140)