refactoring poms
fixing conflict
fixing permission issues
Merge branch 'greg-changes-master' of https://github.com/wso2/enterprise-store into greg-changes-master
Added fix to allow tenant login