I made a draft PR from stu's nailgun changes https://github.com/pantsbuild/pants/pull/9349 , it's basically copy-pasted from his branch