Fix for REGISTRY-3896
Fix for REGISTRY-3896

jeradrutnam/carbon-store,daneshk/carbon-store,cnapagoda/carbon-store,wso2/carbon-store,jeradrutnam/carbon-store,wso2/carbon-store,wso2/carbon-store,cnapagoda/carbon-store,cnapagoda/carbon-store,daneshk/carbon-store,daneshk/carbon-store,jeradrutnam/carbon-store