AS7-6466 Update JSF based on Mojarra 2.1.18