merged 4.1.2

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@175028 a5903396-d722-0410-b921-86c7d4935375
Adding malaka's patch for ESBJAVA-1576

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

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@175030 a5903396-d722-0410-b921-86c7d4935375
removing a unwanted variable

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