1. Adding ServiceLocationCohortDefinition, etc.
2. Adding OrgUnitDisplay, its tests and associated changes to utils and
tests.