Bug 846854: making sure that activeWindow getters have the expected window
Merge pull request #828 from erikvold/846854p1

Bug 846854: making sure that activeWindow getters have the expected window r=@Mossop
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
Bug 846856: TEST-UNEXPECTED-FAIL | tests/test-window-utils-private-browsing.testSettingActiveWindowIgnoresPrivateWindow | Correct active window [1]

It looks like getMostRecentBrowserWindow() doesn't return the window focused when the "focus" event occurs, but instead sometime afterward..
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
Revert "Merge pull request #830 from ochameau/tabs-pb"

This reverts commit a9345e76f37155b32dfb8d6d25ea4df5b7f1e18f, reversing
changes made to b0f21bbb646e6e9f2185a467cdec14a7fc73754b.

Part 1 of Bug 848180
Revert "Revert "Merge pull request #830 from ochameau/tabs-pb""

This reverts commit ddf9d7ef04edf4e5eeb0adab680027a8f67c18ed.
Bug 848898: Uplift the changes made by bug 708984 to the SDK repo. r=gozala