WFLY-1880 Update based on Mojarra 2.2.2