Merge "Fix Neutron-related return values on some list APIs"