TRUNK-4490 EncounterValidator should validate presence of encounter type
(cherry picked from commit d252946e16da5efec63e7f235593dec49c4d4615)