Fix #2566: getLockByID -> getLockFromLockAccess
Merge branch 'buildbot-0.8.9'
Merge branch 'master' into nine