AS7-6598 JSR-344 JSF 2.2 support 

Do not merge this yet.  I just want to see if the OOM exceptions are gone.