Merge pull request #3548 from ebarboni/release121rebuild

Ensure javaee.wildfly is offline buildable to release121