[WFLY-490] Update the XML marshalling based on the modified hierarchy.