Committing fixes for done in WSAS-833. Thanks Geeth for the contribution

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@177836 a5903396-d722-0410-b921-86c7d4935375
Committing fixes for done for WSAS-833. Thanks Geeth for the contribution

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