JavaHL: Fix a couple of JavaHL build warnings.
JavaHL: Fix a couple of JavaHL build warnings.

* build.conf:
  (private-built-includes): Rename a couple of files now generated from the
    org.apache package namespace.

[ reverted in r905828]

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