#557500 Aron Novak, alex_b: Resolve naming conflict 'override per content type setting' and 'override default'.