Merge "conman:  Maintain /tmp/hosts."