Bug 949398: fix missing MarionetteTestOptions. r=jgriffin
Backed out changeset 96b0ddfc63f7 (bug 893304) for causing bug 950589.
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
merge b2g-inbound to mozilla-central