Bug 884421 - Automatic network port selection for /services tests; r=rnewman
Bug 884421 - Part 2: Use a non-standard port in DUMMY_URI; r=bustage
Bug 884421 - Part 3: Fix test_service_wipeServer; r=bustage
Merge mozilla-central into services-central