[WFLY-455] Port the changes contributed by Flemming Harms over to version 2.0 of the schema.