Set correct kind and paths when move-update flags a property conflict.

* subversion/libsvn_wc/wc_db_update_move.c
  (create_conflict_markers): Change kind parameter, set original
   kind and conflicted path.
  (tc_editor_alter_directory, update_working_file): Adjust call.


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