TRUNK-3884 Relationships missing for encounter_provider table
(cherry picked from commit 0b227ca8e6a370b6488903953977f20dd777f7b1)