XCOMMONS-697: Safe XStream serializer implementation does not skip components that don't take the role from an interface
* fix merge