Merge wso2-dev carbon-identity changes by Pulasthi to wso2 repo

Merge wso2-dev carbon-identity changes by Pulasthi to wso2 repo