Merge remote-tracking branch 'upstream/master' into australis
- Fixed typo in button
- Added tests for api-utils, array's union method, and `isLocalURL`
- Improved `api-utils`
Merge pull request #1139 from ZER0/australis-update

Australis update r=@jsantell
Bug 891224 - sidebar tests fail: check for getAttribute("checked")=='false' rather than empty string

Uniform the sidebar testcases for `getAttribute('checked')` where in some platform returns `false` and in others an empty string (in case of `false` the attribute is just removed).
See: https://bugzilla.mozilla.org/show_bug.cgi?id=894809
Merge pull request #1143 from ZER0/sidebar/891224

Bug 891224 - sidebar tests fail: check for getAttribute("checked")=='false' rather than empty string r=@ZER0
Bug 900876 - Add nodeless as contributors to credits.md
Merge pull request #1145 from ZER0/credits/900876

Bug 900876 - Add nodeless as contributors to credits.md
Bug 894515 Fix addon-installer test to support Fennec as targetApplication
Bug 897272 - Add argument to specify cfx xpi output destination
bug 717062 - preferences-branch now configurable

added preferences-branch (package.json), modified cfx (xpi builder),
packages (simple-prefs), adapted tests (cfx, packages, addons), added
new ones.  all tests pass..
bug 717062 - preferences-branch, moar tests

added tests for curly braces ID and invalid preferences-branch value
Revert "Move from Australis branch the changes that are not strictly related to new UI stuff"

This reverts commit db5fa2a4846c85ae1ebe4313c5672b2ba51b8814.
Merge commit '09231032792b717be235c6c5bef920e76031afff' into 902834v7
Bug 902834 - Implement hack and merge australis branch with master

(cherry picked from commit 81520cf6f0d650be6279ede789b302e537bc3d56)
Bug 846165 - Intermittent tests/test-panel.test Document Reload
Bug 866464 test window-observer doesn't throw on Fennec
Merge pull request #1165 from jsantell/866464-test-fennec-window-observer

Fix Bug 866464 test window-observer doesn't throw on Fennec, r+=@erikvold
Merge pull request #1163 from erikvold/846165p2

Bug 846165 - Intermittent tests/test-panel.test Document Reload a=@gozala
bug 717062 - preferences-branch, even more..

..tests
Bug 904136 - Intermittent test failure: TEST-UNEXPECTED-FAIL | simple-prefs/main.testAOM | Timed out

Fixing a race condition, waiting for the document to completely load before running test code.