Merge "Fix non-locking test accounts doc section"