merging branch commits r173148,r173154 to fix ESBJAVA-1196

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@175190 a5903396-d722-0410-b921-86c7d4935375
merging branch commit r174867 to fix ESBJAVA-2032

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