CMS-2386 Component Descriptor XML serializers