Merge change 605

* changes:
  Add '_' to the allowable characters in a host name.