Bug 859920 - Some TPS tests failed when running using mozilla-central build. r=trivial
Merge mozilla-central into services
Bug 861455 - Ensure all providers are loaded during important operations; r=rnewman
Merge mozilla-central into services-central