cherry-pick: fix use of localhost as hostname in unit tests