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