bug 1062302: mac-v2-signing servers sometimes don't return a response to the client - backout concurrency reduction.
bug 1073317: Launchd is broken on 10.6 and above - remove ondemand because it's deprecated, and seems to be broken in some cases. r=dustin
Merge from default.

--HG--
branch : production