When the cancel button is pressed during loading the ShortcutsCustomize, cancel the loading
Bug 830572 - MAC address label overlaps value

Displays MAC address label and value in two lines just like in the 'More information' view of 'Device information'
Bug 858235 - Update Permission prompt Layout
Bug 846402 - Use UTC comparison instead of local time to avoid the effect of timezones.
Bug 859898 - All unsafe / unnecessary innerHTML
use platform-specific path separators so build scripts work on Windows
Bug 856240 - Don't bring TrustedUI opener to background
Bug 861152 - [Settings] Fix alignment of .fake-select
bug 859105: add an l10n-id attribute to the "Send" button, r=stas
Revert "Merge pull request #7686 from Rik/banding-jones-829075"

This reverts commit 2dac54c4032cbd00698eb6f6a6c6408cfd16a8fb, reversing
changes made to dc8ba5b755a11f98e181c3b7cf9718390c4ffb89.

Conflicts:
  apps/system/js/lockscreen.js
  apps/system/style/lockscreen/lockscreen.css
  apps/system/test/unit/lockscreen_test.js

Commits that caused a conflict:
  70b9f4604ca1e3e54a75ca01892ea88c18de459e - bug 848281
  b83581c1547600f1d7a7b18a79a43a8bcc655244 - bug 830644
  3f9979fe26842d90c01e040f57edb9ff59580766 - bug 858118
Bug 861236 - Add keyboard support for the desktop-helper. r=kgrandon
Bug 829075 - Followup to fix linter tests

Followup for Bug 829075 - 9a5e0e4cf3539e27a71188c63d3812ff8ab486dc
Merge pull request #9150 from vingtetun/desktop-helper.keyboard-support

Bug 861236 - Add keyboard support for the desktop-helper. r=kgrandon
Merge pull request #9144 from fabi1cazenave/sendButton-l12y-bug859105

bug 859105: add an l10n-id attribute to the "Send" button, r=stas
Bug 861424 - Bump maxVersion in gaia extension install.rdf's, r=vingtetun
Bug 828287 - Default to https when no scheme is provided during caldav setup r=lightsofapollo
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+
Bug 861494 - Add activities support to desktop-helper if the runtime support MozActivity. r=kgrandon
Merge pull request #9103 from mykmelez/win-l10n

Bug 858640: use platform-specific path separators so build scripts work on Windows r=@ochameau
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.