merging branch commit r173335,r173321,r173276 to fix ESBJAVA-982

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@175186 a5903396-d722-0410-b921-86c7d4935375
removing src to replace with latest branch src

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