Minor changes for mailx compatibility

Slosky, Daniel (Contractor) Arequested to merge
aws into master

Merge request reports