[PAXWEB-614] - Support JSF 2.1
----
manually merged the PAXWEB-614 branch