sync with portable
move unused code to branch 346-envelope-validation
do not lose SF_MFACONNSENT on EHLO
Merge branch 'master' into portable