committing the fix for BAM-1273 in v5

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