[WFLY-3010] Port changes to version 3 of the schema instead of version 2.1