Fixes to JIRA: https://wso2.org/jira/browse/EMM-1845
Fixes to JIRA: https://wso2.org/jira/browse/EMM-1845

wso2/product-mdm,dilee/product-emm,wso2/product-mdm,dilee/product-emm,wso2/product-mdm,dilee/product-mdm,dilee/product-mdm,madhawap/product-emm,dilee/product-emm,Kamidu/product-mdm,Kamidu/product-mdm,Kamidu/product-mdm,dilee/product-mdm,madhawap/product-emm,dilee/product-emm,dilee/product-mdm,Kamidu/product-mdm,madhawap/product-emm,wso2/product-mdm,madhawap/product-emm