Merge "Ensure test for Neutron GET / uses right URL"