Merge pull request #9166 from leob2g/Bug_830901_App_Updates_refresh_download_button_on_showDownloadPrompt

Bug 830901 - [App Updates] Disabling all checkboxes in the update prompt... r=julien(cherry picked from commit 671e2b3a0ac28c77930a795414df48c7d6690359)
Merge pull request #8970 from Archaeopteryx/patch-1

Bug 830572 - MAC address label overlaps value, r=kaze(cherry picked from commit d0d350489a63bd01c57c1e2ce38c758739073221)
Merge pull request #9244 from fabi1cazenave/uplift-v1train-bug830572

bug 830572: uplift on v1-train
bug 861215 - add missing pukArea DOM element back

and fix some style problem
Bug 859661 - use DOMCursor instead of SmsCursor. r=julienw, a=leo+ (cherry-picked from commit e13c4277d880de1e29b74f80fe7e8e1a59664317)
Bug 859662 - Cursor based getThreads(). r=julienw, a=leo+ (cherry-picked from commit a77354cfa6cdae674f029def7ad7044492fb68a2)
Merge pull request #9256 from vicamo/bugzilla/859661/v1-train

Bug 859661 - use DOMCursor instead of SmsCursor. r=julienw, a=leo+ (cher...
Merge pull request #9257 from vicamo/bugzilla/859662/v1-train

Bug 859662 - Cursor based getThreads(). r=julienw, a=leo+ (cherry-picked...
Bug 862900 - remount system partition when doing |make reset-gaia|, r=@ochameau, a=NPTOB
Merge pull request #9253 from evelynhung/issue-861215-v1-train

bug 861215 - add missing pukArea DOM element back
Merge pull request #8555 from pivanov/bug-845061

Bug 845061 - Mail Settings Layout and Type Updates(cherry picked from commit 3b7fb2faf6fd7c4fb1ff568f7978e56fda1f6061)

Conflicts:
	apps/email/index.html
	apps/email/style/setup-cards.css
Merge pull request #9283 from fabi1cazenave/localizationNote-bug860530

bug 860530: add a “LOCALIZATION NOTE” to the email.en-US.properties file, r=stas(cherry picked from commit c9b550dae8a5ce6815466a94d1cbea89dab199fd)
Merge pull request #9285 from fabi1cazenave/bug860530-v1train

Merge pull request #9283 from fabi1cazenave/localizationNote-bug860530
bug 857910 - [Dialer] determine whether oncall screen is locked-style right on load
Merge pull request #9290 from rexboy7/fix-bug857910-v1-train

bug 857910 - [Dialer] determine whether oncall screen is locked-style ri...
Bug 863331 - Fixing Bug 857574 uplift
Merge pull request #9275 from albertopq/contacts-last-contact-chunk-not-rendered

Bug 863180 - Last Contact of a chunk is not rendered (and adding tests) r=arcturus
Merge pull request #9260 from albertopq/contacts-improvefps-scrolling

Bug 862756 - Improving scrolling contacts list fps r=crdc
Conflicts:
	apps/communications/contacts/js/contacts_list.js
Merge pull request #9138 from RudyLu/settings/keep_user-selected_timezone

Bug 847342 - keep the timezone user selected manually, r=@evelynhung, a=tef+(cherry picked from commit 40d6e1385b8abc1e80a6d5723c7be0132da16c0f)
Merge pull request #9314 from yurenju/travis-0418

Bug 863684 - made travis log readable, r=@timdream, a=NPOTB