Fix hostname from being overwritten if its blank.
Merge branch 'dev' of github.com:mozilla-services/heka into dev