Fixes onError/onResult events
Merge branch '6.5.X' of https://github.com/SpringSource/wavemaker into 6.5.X