Merge pull request #20 from pulasthi7/master

Importing svn code changes
Merge branch 'master' of https://github.com/wso2-dev/carbon-identity