Fix for https://wso2.org/jira/browse/IDENTITY-2747
Merge pull request #120 from thariyarox/carbon4-kernel_5

Fix for IDENTITY-2747