Merge latest changes in uddi

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@173665 a5903396-d722-0410-b921-86c7d4935375
Merge a change from branch 4.1.0

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@173666 a5903396-d722-0410-b921-86c7d4935375