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 996883. r=mjrosenb, a=1.2.x+
Bug 967653 - [Inter-App Communication API] Use appsService.getAppByManifestURL(aManifestURL).appStatus to get appStatus. r=fabrice, a=1.2.x+
Merge b2g26 to v1.2f. a=merge