Big Commit: Fix everything broken after using "git svn" to merge hupa-evo from apache-extras.

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