Master: silently pass "lock file exists" errors for git pull
Corrections on testbot pull