Fix issue #5214: hostname persistence on RedHat/CentOS
Merge pull request #5215 from dhml/devel

Fix issue #5214: hostname persistence on RedHat/CentOS