Merge "Skip test_list_server_addresses if neutron until bug 1210483 is fixed"