TDI-30657:Expression Builder for Var in tMap does not show Var name
correctly
Merge branch 'maintenance/5.6'