K 10 svn:author V 6 tuexen K 8 svn:date V 27 2021-03-04T10:37:04.164853Z K 7 svn:log V 308 RACK: fix an issue triggered by using the CDG CC module Manually resolved merge conflics. Obtained from: rrs@ PR: 238741 Sponsored by: Netlix, Inc. (cherry picked from commit 99adf230061268175a36061130e6adb0882270e8) Git Hash: dc27d5312b782b72740d71d81435a80dfe8b78bd Git Author: tuexen@FreeBSD.org END