JUDDI-721 fixed and tested
JUDDI-678 revised fix

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