fixing build failure on carbon-registry
Merge pull request #1 from wso2/master

correcting wrongly added changes to main repo. Merging changes from main repo to dev repo.
Merge pull request #3 from cnapagoda/master

fixing build failure on carbon-registry
Merge pull request #2 from wso2-dev/master

fixing build failure on carbon-registry