Fix for https://wso2.org/jira/browse/ANLYAPIM-21
Fix for https://wso2.org/jira/browse/ANLYAPIM-21

maheshakya/analytics-apim,wso2/analytics-apim,ChamNDeSilva/analytics-apim,ChamNDeSilva/analytics-apim,wso2/analytics-apim,maheshakya/analytics-apim,wso2/analytics-apim,ChamNDeSilva/analytics-apim,maheshakya/analytics-apim,lakmali/analytics-apim-1,ksdperera/analytics-apim,ksdperera/analytics-apim,ChamNDeSilva/analytics-apim,ksdperera/analytics-apim,ChamNDeSilva/analytics-apim,maheshakya/analytics-apim,lakmali/analytics-apim-1,lakmali/analytics-apim-1,ksdperera/analytics-apim,maheshakya/analytics-apim,lakmali/analytics-apim-1,lakmali/analytics-apim-1,ksdperera/analytics-apim