Merge "Set root elements for xsd_config modules"