AS7-6598 JSR-344 JSF 2.2 support

Trying this out with a new PR merged with the latest code.