Don't use deprecated "fill-type" value names in the defailt templaterc. (cherry picked from commit a0805e460a)
a0805e460a