Merge pull request #3073 from obrignoni/2.3/develop

2.3/dev onQuery improvements
Merge pull request #3074 from obrignoni/2.3/develop

2.3/dev Pass the model for more flexibility but still set the query
Fixes issue with multiple fields in a stream not destroying properly
Quit overriding this!!
Fix slugify
Improvements to AbstractField
Fix country FT
Merge branch 'refs/heads/2.3/patch-choice' into 2.3/develop