Merge "Revert "Skip test_list_server_addresses if neutron""