Revert "Fix failing tests in EncounterServiceTest - TRUNK-4545"

This reverts commit 80aa3e09d51d69c03f32fcf29d0f0dea71ff647e.
Revert "TRUNK-4492 - Removed column "Tribe" from demo-data."

This reverts commit 5537823c054e583698db54e6ca6a7febb27ac7bb.