resolved https://wso2.org/jira/browse/CARBON-14916
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 #67 from IsuraD/master

resolved https://wso2.org/jira/browse/CARBON-14916