Merge in Http Message Converter changes from Spring 3.2