Merge pull request #186 from claco/master

Merged automatically by jenkins after successful build test
Detect the version of mailx client installed and use the appropriate syntax
Switch to heirloom mailx on centos (centos default)
Merge pull request #188 from willkelly/master

Merged automatically by jenkins after successful build test