Support for the --kill-nailguns option was inadvertently removed, this puts it back.

Updated the nailgun timeout logic to try and pinpoint transient errors in CI if it
happens again.