Merge pull request #8350 from lodr/no-pin-cc

Bug 841294 - Locked / absent messages for both widget and application added
Cause r+(cherry picked from commit 9b538d012c167ee136d09cb67ca445a3896cdbce)

Conflicts:
	apps/costcontrol/js/app.js
Merge pull request #9101 from lodr/bug-859898-remove-innerHTML

Bug 859898 - All unsafe / unnecessary innerHTML
Cause r+(cherry picked from commit 52f1125f4af3a85e72cf1b1423a5e627df86dfed)
Merge pull request #9272 from lodr/bug-862421-remove-hardcoded-ellipsis

Bug 862421 - Remove harcoded ellipsis and add them to locales
Cause r+(cherry picked from commit f953868fef198c6cb7640e7ecdcc8f34c3262780)
Bug 865411 - [SMS] Banner required to hold message when user reaches the Max Segments in SMS composer r=borja

* implement the notification according to UX and Visual design
* display this notification if we reach the max length
* disable the send button if over 10 segments, but keep it enabled if we have
  exactly the max length
* rewrote the enableSend function to make it more readable and manageable
* use the new markup loader in thread_ui_test.js, and make it global
(cherry picked from commit a64ee1c346e71d7ff64904fcfe7dfbd834f1877d)

Conflicts:
	apps/sms/js/startup.js
	apps/sms/style/sms.css
Merge pull request #9417 from lodr/bug-863778-l10n-issues-solved

Bug 863778 - L10n issues solved and missing icon recovered
Cause r+(cherry picked from commit e9ddc19b350c11349914f0241357780fe884cc73)
Merge pull request #9490 from jedp/863417-prefs-for-persona-urls

Bug 863417 - Can now set toolkit.identity.uri as pref; r=fabrice, a=tef+(cherry picked from commit 9dbb2d9ee919ea75d33be495ff710b7c3a3b24d9)

Bug 863417 - pref for identity ui, fix line too long; a=tef+
(cherry picked from commit f48d569231583b91118f1c9c848796259e35aa7b)
Merge pull request #8552 from pivanov/bug-847478

Bug 847478 - [BB][input_areas] - Input text should be aligned with header r=samjoch(cherry picked from commit cd9e439a33caba739cf4789ed64728ed067d2017)
Merge pull request #9246 from fcampo/RemainingPinIntents-ftu

[ftu] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 7faefd0273f4dce24563cda57450bfb1c7416b45)
Merge pull request #9340 from fcampo/RemainingPinIntents-system

[system] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit b565d874e9dba9d182c9952500869956365dbba4)
Merge pull request #9352 from fcampo/RemainingPinIntents-ussd

[dialer] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 887cae7e556fc19722011f0674fdd4d4bfeacc3e)
Merge pull request #9389 from mozsquib/email-account-type

Bug 863899 - [email] Account Type field in settings doesn't show the account type(cherry picked from commit 3f0c9a2819c8ab8148b532feeef8326a30ad4bb9)
Merge pull request #9531 from crdlc/bug-868286

Bug 868286 - When Home key is pressed 2times quickly, the footer of the ...(cherry picked from commit 5961808d2f9444771147bc593df4f063ecb8cbfe)
Merge pull request #9536 from jmcanterafonseca/outlook_fwup2

Follow-up Bug 862788 Outlook icon in Import Contacts should be updated(cherry picked from commit 3b3ef5c6b9d690544be1837d15fa4eab72710e85)
Merge pull request #9520 from mcirlanaru/bug_849339

Bug 849339 - Lock orientation to portrait when showing sleep menu, r=alive(cherry picked from commit 5840913b484f246753dfb965673a02c09ecb81ad)
Merge pull request #9555 from asutherland/mail-rfc2231

Bug 867909 - [email/IMAP] attachment filenames encoded using rfc 2231 character set encodings instead of mime-words are not decoded. r=squib(cherry picked from commit 55a6259b086c0a74482754e6eebf4d4bab2c0a03)
Merge pull request #9556 from asutherland/email-threading

Bug 866023 - [Email/IMAP] Gaia email client break threads. r=squib(cherry picked from commit 674fdd8a15ca582eb179310c7a2f4f474e38b645)
Merge pull request #9516 from gnarf37/868123-bad-smil

Bug 868123 - [MMS] handle messages with bad SMIL/content-id(cherry picked from commit 114bf216de0a19f7a6e2f63234b4a7a37fff9408)
Merge pull request #9574 from gaye/bug-868654

Bug 868654 - In the day view, 12 PM is wrongly written as 12 AM(cherry picked from commit 472a9d1d2a7494fafbbab3da77793389b73cfa5f)
Merge pull request #9576 from KevinGrandon/bug_868600_safeguard_alarm_check

Bug 868600 - Safeguard alarm check(cherry picked from commit 1998db03be1ecdb00bd3ae334197638e24fe2b0c)
Bug 861080 - [sms]can't select last sms. r=borjasalguero
(cherry picked from commit f5de114feb0a3690dcbe5e226345f4d242a14f97)