Merge pull request #3573 from jpswade/develop

Fix HELO localhost.localdomain violates RFC standards