Merge pull request #10070 from thaJeztah/change-back-error-message

Mention "or rename" again in error-message.

daemon/daemon.go

@@ -542,7 +542,7 @@ func (daemon *Daemon) reserveName(id, name string) (string, error) {
 		} else {
 			nameAsKnownByUser := strings.TrimPrefix(name, "/")
 			return "", fmt.Errorf(
-				"Conflict. The name %q is already in use by container %s. You have to delete that container to be able to reuse that name.", nameAsKnownByUser,
+				"Conflict. The name %q is already in use by container %s. You have to delete (or rename) that container to be able to reuse that name.", nameAsKnownByUser,
 				utils.TruncateID(conflictingContainer.ID))
 		}
 	}