Merge "Change lib/neutron-legacy to use openstackclient"