resolving UES-437
Merge branch 'master' of github.com:wso2/ues