Fix #2566: getLockByID -> getLockFromLockAccess
Merge branch 'buildbot-0.8.9'
Merge branch 'master' into nine
#2588 - check in upgrade_master that rotateLength and maxRotatedFiles are valid
Update relnotes
Merge branch 'buildbot-0.8.9'
Test commit.  Updates #2814.
Test commit.  Updates #2814.
Test commit.  Fixes #2814.
Merge branch 'master' into nine

Refs #2814