committing improvements for https://wso2.org/jira/browse/IDENTITY-1021

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