CMS-3501 Simplify data value classes. Simplified JavaTypeConverters.