WFLY-3876 Porting to IJ 1.2.B4