Bug 1087799, part 1 - Loosen the invariant in nsCycleCollector::FinishAnyCurrentCollection(). r=smaug

If an Unlink() method ends up running JS, it can cause a GC, which will make us reenter the CC,
which will not do anything because we're already in a CC. Therefore, FinishAnyCurrentCollection()
won't finish the CC. This is safe because the CC only touches things it actually holds alive via
the Root() method.
Bug 1087799, part 2 - Rename count to numWhiteNodes in nsCycleCollector::CollectWhite(). r=smaug
Bug 1087799, part 3 - Do not include any JS things in the list of white nodes. r=smaug

Root() does not actually root JS things, so if some other class's Unlink() method ends
up calling the GC, whiteNodes will end up containing dead pointers. (This is safe right
now because the Unlink and Unroot methods do not do anything to JS things.) It is less
error prone to simply never store those pointers.

Also, add some asserts to enforce that we never call any of the white-object methods
for JS things.
Bug 1058845 - Decode raw_input() as UTF-8; r=gps

DONTBUILD (NPOTB)

--HG--
extra : amend_source : cf4f5e29de43f714ae62f247227b17e65debc710
Bug 1088969 - Upgrade Mozilla 36 to use NSS 3.18, landing beta 1, r=wtc
Bug 1087104 - Implement partial mar generation in make for 'mach build'; r=glandium
bug 1024730 - nsIHttpPushListener r=hurley

co-author: ben brittain <ben@brittain.org>
Bug 1074557 - Remove the lock in nsWindowMediator. r=Neil
bug 865314 - ssl parallelism to new host should not be 1 r=hurley
Bug 1050501 - add timeline marker from EventListenerManager. r=smaug r=paul
Bug 1068144 - Expose allocation time stamps in the memory actor. r=jryans
Bug 1088712 - Update toolbar images with glowing download icon. r=gijs
Bug 1089591 - Customize mode should be customizable after reset. r=Gijs r=mconley
bug 1090650 -  Change chromecast app id to point to official chromecast app r=mfinkle
Merge mozilla-central to fx-team
Backed out changeset e6c622c61207 (bug 1089591) bc1 e10s test failure
Bug 1089547: simplify LoopRooms implementation, add support for events. r=Standard8
Bug 1084228 Replace 'callId' with 'windowId' in a Loop conversation window so that it represents what it is and is distinct from the real 'callId'. r=mikedeboer
Bug 1089547: fix error passing in MozLoopAPI and remove leftover in LoopRooms. r=Standard8
Bug 1089913 - Consult Fennec session store for zombie tabs. r=ochameau