Fix cherry-pick / merge issue for server_list while merging from Havana Horizon