Fixing CARBON-14280. Patch by Manoj

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@180745 a5903396-d722-0410-b921-86c7d4935375
CARBON-14312. Patch by Manoj

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

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@180747 a5903396-d722-0410-b921-86c7d4935375
Fixing https://wso2.org/jira/browse/WSAS-1467

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