Merge pull request #1881 from dennishendriksen/master

Remove aggregate event handlers (change query event is sufficient)
new equals including nestedRules
Merge pull request #1882 from bartcharbon/master

new equals including nestedRules
Test case for QueryImpl.equals