Add test of GitLockFailedException
Merge commit '7d34e076db3364912ec35f1ef06a3d638e6ab075' into HEAD