Merge "Change help string to use openstack instead of neutron"