[US5875] a few more updates to SLI-Ed-Fi and first draft of ComplexTypes.xsd