merging branch commit r175024 to fix ESBJAVA-2037

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@175183 a5903396-d722-0410-b921-86c7d4935375
merging branch commit r171346

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