Merge pull request #6539 from joannechester/CRM-16185-rename-date-filters