REPORT-692:  InProgram and InState Cohort Definitions should default to current date

AND

REPORT-691:  Support filtering InProgram and InState Cohort Definitions by location