On the 1.8.x-r1507044 branch, backport r1507044 from trunk, with the
following changes:

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c: 
  Resolve whitespace conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1507044@1507294 13f79535-47bb-0310-9956-ffa450edef68