Fix issue with differing behavior server and client side in filters fix
Add test that highlights issue server-side with previous filter fixes
Merge remote-tracking branch 'origin/filter-event-order-fix' into updated

Conflicts:
	test/Model/filter.mocha.js