Merge "Changing deprecated heat CLI by openstack CLI"