Revert "BS-9592, fix context for expression evaluation, the wrong map was given"

This reverts commit e28b19f0c571550235f4246516af54425bcde8c8.
Revert "BS-9592 [6.2.6] Failed to update contingent field when update value is from a connector"

This reverts commit 19570beae81ffd9fe3fa6b1de43a964e60629964.