Remove more former access baton available checks which are now replaced by wc-ng compatible obstruction checks.
Remove more former access baton available checks which are now replaced by
wc-ng compatible obstruction checks.

* subversion/libsvn_client/merge.c
  (merge_props_changed): Move obstruction check from this helper to ...
  (merge_dir_props_changed): ... here, the directory specific variant.
  (merge_file_changed): Properly initialize optional setting to allow setting
    only when encountering tree conflicts.
  (merge_dir_opened): Remove former access baton available check.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion