Merge pull request #80 from Gayany/master

Changing export schema type
Fixing TOOLS-2497
Reverting the earlier commit for TOOLS-2497
Merge pull request #54 from wso2-dev/master

Merge pull request #41