merge from upstream openstack/python-neutronclient