https://github.com/pantsbuild/pants/pull/5201 should be good for a final review - have been unable to repro a protocol error by moving the lock higher up in the pailgun handling stack.