Merge "Change neutron client methods to return one value and update tests"