Bug 843913: Set DBus watch function to null on event loop exit; r=tzimmermann
Bug 832411 - Build fix for a CLOSED TREE.