Merge "Unskip test that relied on Neutron bug being fixed"