merge

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