TRUNK-3772: Should be able to define EncounterVisitHandlers as spring beans
TRUNK-3772: Post review fixes