[TOM-277] email template objects fixes

Merged Luciano Ortiz requested to merge TOM277 into master

Merge request reports