fixing UES-400
fixing UES-430
Merge branch 'master' of https://github.com/wso2/ues
Merge branch 'master' of https://github.com/wso2/ues