Merge "Neutron service client should not trim API response"