TRUNK-4490: EncounterValidator should validate presence of encounter type

Conflicts:
	api/src/main/java/org/openmrs/validator/EncounterValidator.java
	api/src/test/java/org/openmrs/api/VisitServiceTest.java