Move the creation of the legacy workqueue property conflict marker create skels
to the workqueue to allow further refactoring, and to avoid reading these
functions as functions handling the 1.8+ conflict skels.

* subversion/libsvn_wc/conflicts.c
  (prop_conflict_skel_new,
   prepend_prop_value,
   prop_conflict_skel_add): Move to workqueue.c
  (svn_wc__conflict_create_markers): Update caller, by no longer passing
   data that is already available in the conflict skels.

* subversion/libsvn_wc/workqueue.c
  (prop_conflict_skel_new,
   prepend_prop_value,
   prop_conflict_skel_add): Moved here from conflicts.c.
  (run_prej_install): Resolve a TODO in the most simple way, by moving code
    from svn_wc__conflict_create_markers here.
  (svn_wc__wq_build_prej_install): Remove now unneeded argument.

* subversion/libsvn_wc/workqueue.h
  (svn_wc__wq_build_prej_install): Remove argument and a few TODOs attached to
    this argument.


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