Merge pull request #10504 from crh0716/883053

Bug 883053 - Restore the original connection when connection fails.(cherry picked from commit 1667bf5baa948cd822ee7a594867145e9818f2e5)

Conflicts:
	apps/settings/js/carrier.js
Merge pull request #10622 from ian-liu/sms/Bug881648_give_size_limitation_for_mms

Bug 881648 - [MMS] There is not maximum limit warning, r=@gnarf(cherry picked from commit 147240e7948e8710520bb3777d8707bcfa898c35)
Bug 880588 - Don't remove inline activities when device is locked.
Merge pull request #10659 from alivedise/bugzilla/880588_v1-train

Bug 880588 - Don't remove inline activities when device is locked. r=timdream, a=leo+
Fix bug 883950 - r=gnarf

Closes gh-10648
(cherry picked from commit cee375743267335a4590cd4ba93b9129a179166d)
Merge pull request #9332 from ian-liu/clock/Bug842750_Alarm_label_in_French_not_localized

Bug 842750 - [B2G] [Clock] Default alarm name not localized r=timdream(cherry picked from commit 77db64fee5003b01fee9c1b0d149d124e9e20563)

Conflicts:

	apps/clock/js/alarm.js
Merge pull request #10668 from mozilla-b2g/v1_train/clock/Bug842750_Default_alarm_name_not_localized

Bug 842750 - [B2G] [Clock] Default alarm name not localized r=timdream(cherry picked from commit 77db64fee5003b01fee9c1b0d149d124e9e20563)
Bug 886757 - We need to load the operator size limit for MMS from the apn.json file - r=kaze

* Loading operatorSizeLimitation from apn.json on startup
* Tweak apn.json creator to load setting from operator_variant.xml
* Add values from TEF for operator_variant.xml
(cherry picked from commit 151a1a160d22236a4664440c2f504364ec4a8891)
Bug 887356 - Homescreen grid test failing on TBPL r=crdlc a=tests

This uses sinon to make this sometimes failing test synchronous.
(cherry picked from commit 12a6565c2a053f0d12af51a53ff4b825f4344981)

Conflicts:
	apps/homescreen/test/unit/grid_test.js
Revert "Bug 883787 - Translate the code in HTML comments in the build process"

This reverts commit 53eea8a3da5ae1de3de471a0b1d48aafdd7e81ce.

(cherry picked from commit 7af52f9e69890613c5b9daedb115ef484836ce1b)
Merge pull request #10471 from masap/20130619

Bug 884565 - [WiFi] Fix WPS regression by Bug 879193, r=kaze(cherry picked from commit 6b78f5678ff88eae580500448a8f374958dc2523)
Merge pull request #10473 from mschwart/bug884486

Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey(cherry picked from commit 56c50dd7b322a95a29882526eb00c9e261e43032)
Merge pull request #10501 from crdlc/bug-884728

Bug 884728 - [Facebook] Linking feature is broken deleting all local inf...(cherry picked from commit 427e0100826c677cee1341c4d83793321f16bb5f)
Merge pull request #10579 from EverythingMe/bugfix-helper-title

[Bug 886324] Fix helper's title not showing properly [r=crdlc](cherry picked from commit 6b399c122c87ab1bfd9188c80ff6f02f083c9eea)
Merge pull request #10550 from flodolo/bug886028

Bug 886028 - Fix localizability of "All-day Events" label in Calendar(cherry picked from commit 14367fe868af13c63548d57fd1e2dea0134e65fa)
Merge pull request #10619 from asutherland/email-contact-cache-hit-fix

Bug 882916 - [Email] Forward/Reply/Reply All functionality breaks on structured clone failure when e-mail sender already exists and has been cached. r=lightsofapollo(cherry picked from commit 4fafcace2ad0063a2f7125c57374d3985a4ba7fa)
Merge pull request #10575 from jaoo/883965

Bug 883965 - [Settings] Show the authentication type setting correctly, r=kaze(cherry picked from commit 81bbb91bb690cbe4052f33fca9b57186816b28ef)
Merge pull request #10339 from frsela/STK/Bug874308

Bug 874308 - [Buri][GCF][STK]case 27.22.4.9.2/1 (SELECT ITEM, next action indicator, successful) failed(cherry picked from commit 895b29720949517187f0e8451fa205c6c4b5b232)
Merge pull request #10609 from lissyx/bug883781

Bug 883781 - Ensure that setOptions() and click event do not race, r=RudyLu(cherry picked from commit 128024f0923bfa39fe626f55d4f464be8c9557fc)
Merge pull request #9763 from fzzzy/master

bug 865276 Remove old version of maps from repo; The latest version should be added as a custom app in the distribution file created for a specific release
r=julien(cherry picked from commit 4313facec01e6ed307fcb126efbba76367bee9b4)