Resolving STORE-277
Merge branch 'master' of github.com:wso2/enterprise-store
Resolving STORE-282
Merge branch 'master' of github.com:wso2/enterprise-store