Add local lock to ensure 2 tasks aren't making changes to the local directory at the same time (updated)

Add local lock to ensure 2 tasks aren't making changes to the local directory at the same time (updated) #12973