Bug 995065 - Backout bug 947227 on the release branches. r=jgilbert, a=1.3+
Bug 996009 - Ensure that the richtext2 browserscope tests do not attempt to contact the external network. r=roc, a=test-only
Bug 996019 - Fix browser_bug435325.js to not connect to example.com. r=ehsan, a=test-only
Bug 996031 - Remove 455407.html crashtest. r=dholbert, a=test-only

The bug that this test was intended to test seems transient, according to
testing with nightlies around the time the bug was filed.  Additionally,
the test connects to external servers, which is frowned upon and will soon
be forbidden.
Bug 995995 - Set testing prefs to redirect to the test proxy server for RSS feeds. r=jmaher, a=test-only
Bug 989022 - JS error Causing a blank screen on Webpay if sim is not present. r+a=fabrice
bug 991393 - flame configs. r=catlee a=npotb DONTBUILD
bug 991393 - update flame branches. r=hwine a=npotb DONTBUILD
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/e1441d1b2e12
Author: Marshall Culpepper <marshall.law@gmail.com>
Desc: Merge pull request #17859 from marshall/ftuPing_v1.3

Bug 969101: Initial implementation of a first-time use ping. r=fabrice

========

https://hg.mozilla.org/integration/gaia-1_3/rev/fe95a000328c
Author: Marshall Culpepper <marshall@mozilla.com>
Desc: Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Bumping manifests a=b2g-bump
Merge b2g28 to v1.3t. a=merge