Separate merger/server pidfile/logging better

So that they may safely coexist on a single host.

Change-Id: I64698423670bf11051c40ad80427643dd0f3d0cd