Fix #2566: getLockByID -> getLockFromLockAccess
#2588 - check in upgrade_master that rotateLength and maxRotatedFiles are valid
Update relnotes