use platform-specific path separators so build scripts work on Windows
Bug 856240 - Don't bring TrustedUI opener to background
Bug 861142 - Take a screenshot if we don't have one in the cache.
bug 859105: add an l10n-id attribute to the "Send" button, r=stas
Bug 853757 - [Buri][Email/IMAP] Attachment names are not being MIME-word decoded. r=squib. a=blocking-b2g=tef+

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/174

does require copy-into-gaia.js fixup from:
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/175
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+
Bug 861171 - Remove idle/devicestorage and the apps/ folder of the desktop-helper extension. r=kgrandon
Bug 859902 - added empty workloads, also fixed push to detect idb directory
Merge pull request #9147 from vingtetun/desktop-helper.delete.idle.storage

Bug 861171 - Remove idle/devicestorage and the apps/ folder of the deskt...
Bug 859879 - Add New Number screen not translated with GAIA_DEFAULT_LOCALE.
Merge pull request #9126 from JonHylands/jhylands-859902-add-empty-workloads-master

Bug 859902 - added empty workloads, also fixed push to detect idb directory r=julienw
Merge pull request #9139 from gtorodelvalle/dialer-bug-859879-add-new-number-localization

Bug 859879 - Add New Number screen not translated with GAIA_DEFAULT_LOCALE (r=etiennesegonzac).
Bug 861180 - Remove power shim r=vingtetun
Merge pull request #9148 from KevinGrandon/bug_861180_remove_power_shim

Bug 861180 - Remove power shim r=vingtetun
Merge pull request #9141 from KevinGrandon/bug_861142_missing_screenshots

Bug 861142 - Take a screenshot if we don't have one in the cache.
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