Merge "Re-factor neutron client for 'update' methods"