Merge "Make sure filtered_by_ip list servers test uses correct ip filter"