Adds back hasOverride caches in AbstractFilter for performance.
Merge branch 'release/2.2'
Merge branch 'master' of github.com:perfectsense/dari