WFLY-2022 Update based on Mojarra 2.2.3