resolved https://wso2.org/jira/browse/CARBON-14916
Fixing CARBON-14564 - Ant localize task error when multiple resources files are present
Merge branch 'master' of https://github.com/wso2-dev/carbon4-kernel

Conflicts:
	core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java
Merge pull request #78 from GayashanNA/CARBON-14564

Fixing CARBON-14564 - Ant localize task error when multiple resources files are present
Merge pull request #67 from IsuraD/master

resolved https://wso2.org/jira/browse/CARBON-14916
Merge pull request #81 from arunasujith/master

Fix for CARBON-14767