fixing UES-224.(recommitting what was undone by c7168eb)
Merge branch 'master' of github.com:wso2/ues