synching with trunk

git-svn-id: https://svn.apache.org/repos/asf/juddi/branches/juddi-3.2.x@1483174 13f79535-47bb-0310-9956-ffa450edef68