fixing STORE-85
fixing issues
Merge branch 'master' of https://github.com/wso2/enterprise-store