Merge change 8953

* changes:
  Store all IP addresses for a hostname instead of just one.