Added keystore elements to catalina-server.xml
Merge branch 'master' of https://github.com/wso2-dev/product-as
Merge pull request #16 from wso2-dev/master

Merging latest changes