Bug 989009 - should theme live bookmark submenu items correctly, r=mak

--HG--
extra : rebase_source : 2f15dd69b48e0e5b81a84f74224c8c3dcc5c66ec
Bug 989133 - Add a soft hyphen to the character encoding label for en-US to avoid auto-hyphenation. r=MattN
Bug 985958 - fix CSS rules to make :active style work, r=mconley

--HG--
extra : rebase_source : 71959a860f742dcfd5b92fec0d161f048905578d
Bug 836790 - Don't HTTP GET remote changes if info/collections says there are none. r=rnewman
Bug 989098 - Use wrapper object to pass generic objects in sendResponse. r=wesj
Bug 986951 - Try to fix intermittent browser_tabview_bug6513111.js failures r=gavin
Configure changes for Bug 962381 - Add support for NSIS 3.0a2. r=mshal
bug 979438 - Unify android target SDK versions r=nalexander

--HG--
rename : embedding/android/geckoview_example/AndroidManifest.xml => embedding/android/geckoview_example/AndroidManifest.xml.in
rename : mobile/android/geckoview_library/AndroidManifest.xml => mobile/android/geckoview_library/AndroidManifest.xml.in
rename : mobile/android/geckoview_library/project.properties => mobile/android/geckoview_library/project.properties.in
Bug 976680 - Remove landscape padding from home banner. r=bnicholson
Followup for Bug 792075 - Update links in Control Panel. r=me
bug 979438 - Unify android target SDK versions, follow up to address nits r=nalexander

--HG--
extra : rebase_source : 841e8eece32e10d6d2c3443d5bcbf7ac935dd157
Merge m-c to fx-team
Bug 989168 - Disable manifest editor test on Linux. r=me
Bug 989025 - WebConsole breaks when trying to autocomplete in objects from different domains; r=past
Bug 988563 - Restore Mac simulator UI (WTF Mac OS: Round 2). r=ochameau
Bug 987784 - Update the browser console default prefs to match those of the web console; r=robcee
Bug 989479 - Fix disabled=false state for in-content preferences r=jaws
Bug 975000 - Disable updating and compatibility checking for Experiments; r=Unfocused

Experiment add-ons are installed and updated via the Experiments Manager
service. With this change, the Add-ons Manager lets experiment add-ons
play by their own rules without interference.

--HG--
extra : rebase_source : 4a7c30f8ce36a64f91f9fee49da9061eda568b99
Bug 985084 - Experiment add-ons should be disabled by default; r=Unfocused

Experiment add-ons are now disabled by default on application load. It
is up to the Experiments Manager to enable them.

This means that experiments may not be able to reliably collect data or
modify behavior close to application startup. (There is a window between
when the Addon Manager initializes and when the Experiments Manager
initializes.) This window is acceptable for the initial version of the
experiments feature.

The Experiments Manager doesn't currently enable experiments on startup.
This will be addressed in a subsequent patch. Its tests do not regress
(indicating a lack of test coverage), so no harm no foul.

--HG--
extra : rebase_source : 3c550090e3480127dc679cc5247f249ee822e76f
extra : amend_source : 9b5349b507c73b4713ec447e4f1a6cb841c11c56
extra : source : 0d72fd2fbd1d091c27fa4a0a9c1944282eaa9ac5
Backed out changeset 4834a3833639 and c580afddd1cb (bug 985084 and bug 97500)

--HG--
extra : histedit_source : c580afddd1cb90bd3cccbc7abc8082132ffe2a3c%2C4371c5775a71d493e82f193b1cf15efd44566645