I have also added a commit to rename mvc:content-negotiation to mvc:content-negotiating, in order to be consistent with JavaConfig.