Merge "Removing duplicate hostip entry"