Roll svn_wc__node_get_lock_info() into svn_wc__node_get_base(), to avoid
having to do double work in its single caller in a later patch.

* subversion/include/private/svn_wc_private.h
  (svn_wc__node_get_base): Add lock_token argument.

* subversion/libsvn_client/commit_util.c
  (harvest_status_callback): Update caller.

* subversion/libsvn_client/locking_commands.c
  (organize_lock_targets): Update caller.

* subversion/libsvn_client/merge.c
  (calculate_remaining_ranges): Update caller.

* subversion/libsvn_client/mergeinfo.c
  (svn_client__get_wc_mergeinfo): Update caller.

* subversion/libsvn_client/util.c
  (svn_client__wc_node_get_base): Update caller.

* subversion/libsvn_wc/node.c
  (svn_wc__node_get_base): Handle lock_token.
  (svn_wc__node_get_lock_info): Remove function.

* subversion/tests/libsvn_wc/wc-test.c
  (test_node_get_base): Update caller.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1442630 13f79535-47bb-0310-9956-ffa450edef68