[5.4] Fix for envelope-from & return path alignment with From in MailTemplateFactory#46431

TLWebdesign wants to merge 2 commits intojoomla:5.4-devjoomla/joomla-cms:5.4-devfrom

TLWebdesignNL:5.4-devTLWebdesignNL/joomla-cms-maildelivery:5.4-devCopy head branch name to clipboard