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