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 <scott-allendorf@uiowa.edu>