Now that we have a CompositeContentTypeResolverBuilder with built-in defaults, we switch to those defaults in places where a ContentTypeResolver is used.