TRUNK-3915 Resolved and successfully tested.
(cherry picked from commit cebb56d9a123a47ff420c0ade74239d2c3d8c426)
TRUNK-3915 Corrected back port
Revert "TRUNK-3915 Corrected back port"

This reverts commit 4764752200209a0329e77b20aa1ca372c5518ccc.
 Revert "TRUNK-3915 Resolved and successfully tested."

This reverts commit e0a7c2b8b950fe4687b666459232b00f2a486662.
TRUNK-3884 Relationships missing for encounter_provider table
(cherry picked from commit 0b227ca8e6a370b6488903953977f20dd777f7b1)
Applying auto format changes