merging branch commits r173519 for ESBJAVA-1108 and r173386 for ESBJAVA-1082

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