Fixes addressing two issues identified during DTS transfer#277

Shubhangi-cs merged 1 commit intorelease/1.6data-integrations/salesforce:release/1.6from

dts_bugs_release1.6data-integrations/salesforce:dts_bugs_release1.6Copy head branch name to clipboard