[6.16.z] hosts table: Name locator fix (again)

[6.16.z] hosts table: Name locator fix (again) #1315