[WFLY-3344] Port WF 8 updates to WF 9 schemas.

Picking up that some schemas were forked for WildFly 9 development whilst maintenance continued on the WildFly 8 base versions.