Fixes for STORE-599 and STORE-603
Fixes for STORE-599 and STORE-603

cdwijayarathna/jaggery-extensions,lalankea/jaggery-extensions,cdwijayarathna/jaggery-extensions,lasanthaS/jaggery-extensions,ayshsandu/jaggery-extensions,udarakr/jaggery-extensions,splinter/jaggery-extensions,udarakr/jaggery-extensions,wso2/jaggery-extensions,rajeenthini/jaggery-extensions,cdwijayarathna/jaggery-extensions,chaturadilan/jaggery-extensions,rajeenthini/jaggery-extensions,splinter/jaggery-extensions,udarakr/jaggery-extensions,ayshsandu/jaggery-extensions,lalankea/jaggery-extensions,chaturadilan/jaggery-extensions,lasanthaS/jaggery-extensions,ayshsandu/jaggery-extensions,wso2/jaggery-extensions,splinter/jaggery-extensions,chaturadilan/jaggery-extensions,wso2/jaggery-extensions,rajeenthini/jaggery-extensions,lasanthaS/jaggery-extensions,lalankea/jaggery-extensions