Fixed issues related to user type
Merge branch 'feature/tenant-configurations' of github.com:wso2-dev/product-emm into feature/tenant-configurations