[DDC-2300] Fix version xml mapping and serialization of ClassMetadata.
Merge branch 'DDC-2300' into 2.3