[WFLY-3349] Synchronization of cosmetic schema changes with EAP.

The purpose of this commit is to make it easier to verify that the EAP and WildFly schemas are actually in synch.
Merge pull request #6267 from darranl/WFLY-3349

[WFLY-3349] Synchronization of cosmetic schema changes with EAP.