fixed some mysterious but annoying DaoFilter issues
fixed all of the lucene issues that have been plaguing us
Merge remote-tracking branch 'origin/sr' into sr