LPS-41504 Fix StructureXsdException
LPS-41403 update code for bnd API changes
SOS-1837 Fix classNameId.