Merge pull request #9065 from etiennesegonzac/bug-858722-settings-permissions-fix

Bug 858722 - Fixing the busted permissions panel of the settings app, r=kaze(cherry picked from commit 782e588ef0980ddef6a93feb4270619c3a2f777c)
uplift -- bug 828890 (+858722): Scroll bar should not go over the header
Merge pull request #9152 from fabi1cazenave/uplift-bug828890

Bug 828890 — uplift to v1-train
Bug 857837 - Enter NCK/CCK/SPCK popup should pop up at boot up if phone is in network/corporate/serviceprovider locked state r=jaoo

Get rid of the setTimeout ack now that Bug 849757 is fixed.

Warning: do not uplift if Bug 849757 is not uplifted.
(cherry picked from commit 3fa788342953f33ab980fa1ba28deba1a1b8e650)
Merge pull request #8967 from mcirlanaru/bug_835972

Bug 835972 - Display SIM PIN dialog (if SIM card locked) for apps that ...(cherry picked from commit b126eeb39ed9bfa1e5662386f74611d5d6527b18)

Conflicts:

	apps/system/js/sim_lock.js
Merge pull request #8688 from jedp/851492-test-close-iframe-master

Bug 851492 - Add unit test for id-dialog-close-iframe event(cherry picked from commit bf8bff25d573ed6ccd3966bf80be37097ebc8357)
Merge pull request #8651 from fabi1cazenave/lazy_load_l10n_date_bug849184

bug 849184: lazy-load l10n_date.js in Settings, r=etienne(cherry picked from commit d29b590e08614cda4bdfe54f188a1d456c656037)
Merge pull request #9146 from asutherland/email-decode-attachment-names

Bug 853757 - [Buri][Email/IMAP] Attachment names are not being MIME-word decoded. r=squib. a=blocking-b2g=tef+(cherry picked from commit f1ecd026aee670aa11a9f103b48ff325794f7677)
Merge pull request #9144 from fabi1cazenave/sendButton-l12y-bug859105

bug 859105: add an l10n-id attribute to the "Send" button, r=stas(cherry picked from commit c117dc2dfdf90fc9a3ad9d429d78d87f66013d21)
Merge pull request #9083 from alivedise/bugzilla/856240/dont-kill-trustedui

Bug 856240 - Don't bring TrustedUI opener to background, r=timdream, a=blocking-b2g:leo+(cherry picked from commit dec958af6e40d213bd9b4a404110567a21222b03)