I'm not sure why the patch I put in place would cause a collision with the old code - underneath it all it was the same

lockfile

python library. I did update the rev of the lockfile library to the latest though.