TRUNK-3772: Should be able to define EncounterVisitHandlers as spring beans
(cherry picked from commit 9026fc5ea13121af8a688a2fb80adc2f540bf1e6)
TRUNK-3772: Post review fixes
(cherry picked from commit 179d5419589ca6951bfba52c6d6380038dff5bf4)