Bug 966134: merge warning dialog should mention new email, not old email, and we should avoid storing the plaintext of signed-in users forever, r=markh

--HG--
extra : rebase_source : cee71c3201ee6fffc477d2cced50e0df567a0976
Bug 958666 - Disable autofocus on b2g. r=vingetun
Bug 966159 - Fix TypeError when trying to unlink account. r=ckarlof
Bug 932235 - [Australis] New "Email Link" Icon. r=jaws
Bug 958679 - UITour: Add the Accounts button within the Australis menu panel to the list of targets. r=Unfocused
Bug 963937 - Add a pref to disable automatic bracket closing in source editor. r=anton
Merge m-c to s-c.
Bug 964229 - IonMonkey: Split StringPolicy and support all primitives to MToString, r=jandem,sstangl
Bug 950931 - Re-enable disbaled jit tests r=terrence
Bug 959787 - Handlify JS_GetProperty and related APIs r=terrence r=bz
Bug 965904 - Fix some rooting hazards in the browser r=terrence
Backed out changeset e2c75ec7f3d4 (bug 959787) for breaking b2g builds on a CLOSED TREE
Bug 964626 Fix some nits of logging code in nsTextStore r=jimm
merge mozilla-inbound to mozilla-central
merge fx-team to mozilla-central
merge b2g-inbound to mozilla-central
Merge mozilla-central to mozilla-inbound
Bug 963441 - Make sure we push an existing next-in-flow sibling too.  r=dholbert
Bug 965804 - Ignore the deprecated texture pref except on Windows. r=Bas,Vlad
Bug 965844 - Remove the pref "layers.prefer-memory-over-shmem". r=gal