Issue #263: add an addtional test to "complete" coverage for locks and conflicts ...
Issue #263: proposed bugfix plus test mods
Issue #263: update Lock Command Reference for this bug [ci skip]
Merge branch 'issue_263' into dev