Update host/ip pairing rather than add the hostname a second time
Added replace kwarg whether to first remove any existing hostnames that match
Merge pull request #6683 from kevinastone/develop

Update host/ip pairing rather than add the hostname a second time