merging branch commit r173535 to fix ESBJAVA-1072 and r173155 to fix ESBJAVA-1569

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