Fix failing tests in EncounterServiceTest - TRUNK-4545
Merge branch 'master' of https://github.com/openmrs/openmrs-core
TRUNK-4492 - Removed column "Tribe" from demo-data.
Merge branch 'master' of https://github.com/openmrs/openmrs-core