Rename 'actual_props' to 'old_actual_props' in several libsvn_wc merge
routines, for clarity.

* subversion/libsvn_wc/wc.h
  (svn_wc__internal_merge, svn_wc__perform_file_merge): Rename the
    'actual_props' parameter.

* subversion/libsvn_wc/merge.c
  (merge_target_t, svn_wc__internal_merge, svn_wc_merge5): Rename the
    'actual_props' member/parameter/variable.
  (detranslate_wc_file, merge_text_file): Adjust accordingly.

* subversion/libsvn_wc/update_editor.c
  (svn_wc__perform_file_merge): Rename the 'actual_props' parameter. Fix a
    comment; tweak a comment.


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