Merged. Some changes that should already have been incuded during previous merge (mostly about PlcStatus) have been included this time.
<xsd:element name="Xenomai">
<xsd:complexType>
%(toolchain_gcc)s
<xsd:attribute name="XenoConfig" type="xsd:string" use="optional" default="xeno-config"/>
</xsd:complexType>
</xsd:element>