STORE-123 and STORE-265
Merge branch 'master' of github.com:wso2/enterprise-store