Merge branch 'fb_datafilter' of https://github.com/LabKey/cds into fb_datafilter
Spec #21606: fixes for filter detail and overview with where vs count filters