Modify shell to deal with a modern (or modernish) version of openstack-client