Merge pull request #9469 from asutherland/email-addressparser-apostrophe

Bug 866996 - [email] update addressparser node-dep to not think apostrophes are trying to quote display names. r=asuth(cherry picked from commit b9583de0462c6b126921d317bc9a36c3ab264605)
Merge pull request #9465 from gregorwagner/matchContacts

Bug 859185 - [Dialer] When calling number that device isn't saved, call screen shows similar number.(cherry picked from commit 5cfdae8ca2c748225d97cc2437fbce0368f96213)
Merge pull request #9451 from rexboy7/fix-bug852857

Bug 852857 - Postpone battery drainage check after homescreen is retriev...(cherry picked from commit 9a45a5ff866515ec4bf75e19b845b97f37037dad)
Merge pull request #9499 from jlebar/sms-use-cpu-lock

Bug 867649 - Switch the SMS app from using the high-priority wake lock t...(cherry picked from commit e9b649b29602e571ef96892f62fc52fb19364639)
Merge pull request #9503 from alivedise/bugzilla/864257

Bug 864257 - update wifi relative signal strength on statusbar, r=timdream, a=blocking-b2g:tef+(cherry picked from commit bc166560b278ef89fa9cb63591ec1d32b810556e)
Merge pull request #9509 from asutherland/tcpsocket-errors

Bug 855569 - [Buri][Shira-48042][Email] Message shown when bad certificates are used is not the right one. r=squib, a=blocking-b2g=tef+(cherry picked from commit de2a73e76b0bbe05759102d2c370eacb7eece6da)
Merge pull request #9511 from gtorodelvalle/dialer-bug-866378-number-can-be-null

Bug 866378 - [OPEN_]It does not have ringtone when receiving an Unknown number call and can not answer this call (r=jmcanterafonseca)(cherry picked from commit c247f1238c6cc7c845796a707982f79cdbc99418)
Merge pull request #9495 from mvines/bug842506

Bug 842506 - [music] When player is not visible don't update track time r=alive(cherry picked from commit 8728f505c3f7e053dc6ff4158f1dc0cbbfa4ad5e)
Bug 866578 - [music] change the option of shuffle all from title to shuffleAll
Merge pull request #9527 from dominickuo/bug-866578

Bug 866578 - [music] change the option of shuffle all from title to shuffleAll, r=timdream
Bug 863335 - Download Update via data screen update
(cherry picked from commit e69553c36894979e0be587fe2b172a8b6795d803)

Conflicts:

	apps/system/style/update_manager/update_manager.css
	shared/style/confirm.css
Bug 844900 - Replace SMS "Desktop Mock" with mozSms mock

Mock out the native mozSms API in environments where it is not defined
(e.g. FireFox and B2G-desktop). This promotes code re-use across
environments. This work introduces message deletion in desktop
environments by mocking `mozSms.delete`.

Reference global variables to enable optional control of simulation
behavior.

Update the application's usage of the mocked `SMSRequest` object to
properly reference the `error.name` property defined on `DomRequest`
objects.

r=julienw
(cherry picked from commit ae2a435a39e7cb35a63f73edcfa4b4cbcf0ab1dd)

note from uplifted: Also took the part of Bug 859662 that was not uplifted
because this one was not uplifted.

Conflicts:
	apps/sms/js/contacts.js
	apps/sms/js/message_manager.js
	apps/sms/js/thread_ui.js
Merge pull request #9174 from comoyo/fix_sms_mock

Bug 861814 - Fix the SMS Mock. r=arcturus(cherry picked from commit 074e681c3743503f7170c2ac1c604ede73ac497d)
a=npotb
Bug 863776 - Fix SMS tests caused by Bug 843511 r=borja

* rename the desktop mock to not conflict with the unit test mock
* better cleanup in the sms_test 'unit' test
* moved some of the `ThreadUI` tests that were in `sms_test` to `thread_ui_test`
* stubbed window.history.back in sms_test.js so that we don't leave the
  test-agent
(cherry picked from commit 0cd9bc4755307186d2b05e11d93c463d532d604f)
Merge pull request #9281 from borjasalguero/ww_new_layout_implementation

Bug 860680 - [SMS][MMS] Include new layout in SMS/MMS App r=julienw(cherry picked from commit 60cdc0740438986c4fe502eb9c0822ce14248ef7)
Merge pull request #9384 from gnarf37/sms-test-real-html

[865287] Use real index.html for sms_test(cherry picked from commit e150fb80302bebef676cf0e972bd17f83de97993)
Bug 865355 - [MMS] Switch mozSms with mozMobileMessage r=julien
(cherry picked from commit 20e4b6dd1c18eb0a3b3a37f6b2fb6b5bdb6aec51)
Merge pull request #8254 from steveck-chung/MMS_resize_utility

Bug 840038 - [MMS][User Story] Image rescaling to 300kB. r=borjasalguero(cherry picked from commit 16bb4eb76b240a3f5f7e080bdc1864e0f6148729)

Conflicts:
	apps/sms/js/utils.js
Merge pull request #8673 from timdream/fix-mock-fb-utf8

Bug 851476 - Fix encoding of mock_fb.js(cherry picked from commit 8accbbb49b1b67fd7b93194e07e6bf017e0c90c3)
Merge pull request #9413 from comoyo/fix_sdcard_tests

Bug 862742 - Fix lint and unit tests errors for sdcard import r=francisco.jordano(cherry picked from commit a75b3731696570c2851522758dd1653fcaebcb96)