REPORT-664 - Remove old EncounterQueryService/Dao in favor of EncounterQuery implementations