fixing WSAS-1836
Merge pull request #39 from callkalpa/WSAS-1836

fixing WSAS-1836
Merge pull request #43 from wso2-dev/AS6.0.0

As6.0.0