Merge mozilla-central to mozilla-inbound
Backed out changeset 6f7f5787e46e (bug 953164)
Backed out changeset 3a23bcbc4e60 (bug 953164) for JS Reftest Bustage on a CLOSED TREE
Bug 401564 - Test and fix for redirection losing Accept header. r=mcmanus

The test has a redirect where the initial GET request had Accept:
application/json, and ensures that this is also the type of the
redirected request.

The fix is done in the setup of the replicated HttpBaseChannel, where
the previous channel's Accept header is copied to the new one, if it
exists.
Bug 961776 - Add role=key to the event fluffing heuristics. r=roc
Bug 970774 - Add display width/height for track encoder. r=rillian
Bug 968762 - Plugin overlays are not displayed if plugin element is not fully in scroll view. r=jaws
Bug 922107 - Add pref to hide the "missing plugin" notifications. r=jaws
Bug 922107 - Add test for pref to hide the "missing plugin" notifications. r=jaws
Bug 976161 - delete dead NSCAP_DISABLE_TEST_DONTQUERY_CASES code; r=bsmedberg
Bug 970504 - make JS_CLASS_MEMBERS useful in more places; r=jorendorff
Bug 970498 - remove unnecessary padding in JSClass and js::Class; r=Waldo
Bug 976306 - mozversion missing from config/mozbase_requirements.txt; r=wlach
Bug 971822 - Fix string_util.h combined with strsafe.h on mingw. r=glandium
Bug 663740 - char16_t/wchar_t mismatch fixup.
Bug 975740 - Fixed typo in testing/tools/screenshot/moz.build
Bug 975803 - Workaround a MSVC10 compiler bug. r=luke
Bug 974356 - 1/4 - Initialize mOtherProcess to an invalid handle value - r=bent
Bug 974356 - 2/4 - add an IsSameProcess method to ISurfaceAllocator - r=nical
Bug 974356 - 3/4 - Make TextureHost::CreateIPDLActor check for bad MemoryTextures - r=nical