* src/ne_locks.c (end_element_common, can_accept): Support lockroot element.
(common_cdata, ld_cdata, lk_cdata): Use common cdata collector.
* src/ne_locks.h (ne_lock_result): Clarify that the returned lock may have a different URI to the discovery URI.
* test/lock.c: Add checks for returned lock URI throughout.