Another UKV remove for RF1
Add a locking / overlap test, & logging

-Dlog.LOCKS=true adds locking logging