When generating the .prej file for property conflicts, don't destroy
the inserted localised strings by converting the entire file to ASCII;
only the property values should be converted.

* subversion/libsvn_wc/props.c
  (append_prop_conflict): Don't call svn_utf_cstring_from_utf8_fuzzy.
  (prop_conflict_from_skel): Convert property data to ASCII first.

Approved by: stsp


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