K 10 svn:author V 2 cy K 8 svn:date V 27 2019-04-23T04:06:26.183460Z K 7 svn:log V 189 Fixup mismerge of r345079. CONFS in HEAD and stable/12 is FILES in stable/11. This is a direct commit to the stable/11 branch. Reported by: Allendorf, Scott C END