bug 882186 - adding net_error page
Bug 918762 - unxfail test_dialer_airplane_mode due to bug 904625 was fixed
bug 918592 - refactor logic so that we use values from settings first, fallback to support.json contents if available.

r=qDot
Merge pull request #12336 from bebef1987/unxfail_air_dail

Bug 918762 - Un xfail test dialer airplane mode
Bug 919024 - Fix emergency dialer key order.
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