Merge pull request #12346 from eeejay/bug-919024

Bug 919024 - Fix emergency dialer key order. r=etienne
Merge pull request #12348 from nullaus/bug918592-support-json

bug 918592 - refactor logic so that we use values from settings first, f...
Bug 918602 - Give keyboard keys 'key' role.
Merge pull request #12325 from eeejay/bug-918602

Bug 918602 - Give keyboard keys 'key' role. r=djf
Merge pull request #12284 from mikehenrty/bug-882186-bluescreen

bug 882186 - adding net_error page
bug 918583

-bind context to listener used in operator variant apn customizer.
-Use mozSettings directly, do not rely on local shorthand variable because of varying contexts.

r=gwagner
Merge pull request #12347 from nullaus/bug918583-operator-variant-helper

bug 918583 - bind context to listener used in operator variant apn custo...
Merge pull request #12245 from EverythingMe/bugfix-903405

[Bug 903405] [E.me][L10n] After changing language, the description in e.me should change [r=crdlc]
Bug 919724 - Remove random, unused test-data/ directory from calendar
Revert "Temp disable browser test until bug 919584 is fixed"

This reverts commit 3e248f64f8b7b4fdf6e5ecd3691e3fb4d11b8720.
Allow |make test-integration| to configure mocha reporter and npm registry
Merge pull request #12005 from mcirlanaru/bug_913782

Bug 913782 - [Keyboard] Update build settings for 3rd party keyboard... r=@yurenju
Merge pull request #12408 from lightsofapollo/unxfail-browser-stuff

Revert "Temp disable browser test until bug 919584 is fixed"
Bug 915018 - Contacts lazy load overlay
Bug 915055 - Move functions from contacts.js
Merge pull request #12110 from KevinGrandon/bug_915055_contacts_method_ownership

Bug 915055 - Contacts move functions from contacts.js r=arcturus,jmcf
Merge pull request #12105 from KevinGrandon/bug_915018_contacts_overlay_lazy

Bug 915018 - Contacts lazy load overlay js r=arcturus,jmcf
Bug 907907 - Lazy load Contacts DOM nodes via HTML Import polyfill
Merge pull request #12405 from gaye/bug-902124

Bug 902124 - Makefile should configure gaia-marionette
Merge pull request #12375 from gaye/bug-919724

Bug 919724 - Remove random, unused test-data/ directory from calendar