Merge pull request #7204 from alexcrichton/beta-next

[beta] Revert "Release a jobserver token while locking a file"