Bug 946754 - [Australis] Switch CustomizableUI tests from using homebrewed test runner to built-in add_task. r=mconley
Bug 950051 - context-menu reload in SocialAPI panels doesn't reload the panel, r=mixedpuppy.
Backed out changeset 7b156069de68 (bug 936065) for causing bug 950320 r=smacleod
Bug 949208 - Don't use reflection to get database name in robocop tests. r=wesj
Bug 949398: fix missing MarionetteTestOptions. r=jgriffin
Backed out changeset 96b0ddfc63f7 (bug 893304) for causing bug 950589.
Bug 885052 - Fullscreen-button is checked during customization mode if the browser is in fullscreen. r=Unfocused
bug 914921 make status button work in Australis menu panel, r=markh
bug 940155 make marks button work in Australis menu panel, r=markh
Merge m-c to fx-team
bug 935640 part 1 Australis, update social sidebar with new ux, r=markh
bug 935640 part 2 Australis, update social sidebar with new ux, activation panel, r=markh
bug 935640 part 3 Australis, update social sidebar with new ux, test updates, r=markh
Backed out changeset 663470a9a54b (bug 885052)
Bug 885052 - Fullscreen-button is checked during customization mode if the browser is in fullscreen. r=Unfocused
Merge m-c to b2g-inbound
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3ef8194476ef
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #14738 from gregorwagner/back

Revert "Merge pull request #12717 from punamdahiya/Bug924170_Video_Mario...

========

https://hg.mozilla.org/integration/gaia-central/rev/1f5915accd4f
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Revert "Merge pull request #12717 from punamdahiya/Bug924170_Video_Marionette_Tests"

This reverts commit 7deffe21aedd0b1908d981be4a348f148a4332e8, reversing
changes made to 1f275beb53779feb31e1b00611c5e85428c431ae.
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/79e25f81e1e8
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #14492 from chuck-lee/bug-947810_show_wap_push_auth_info

Bug 947810 - Show authentication information in WAP-Push test app. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/90d86e8fe8f7
Author: Chuck Lee <chulee@mozilla.com>
Desc: Bug 947810 - Show authentication information in WAP-Push test app. r=arthurcc
Bug 950631 - ReferenceError: credentials is not defined in FxAccounts.jsm. r=jedp
Backed out changeset af77b8d3a9e1 (bug 885052) for b-c testfailures on a CLOSED TREE