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