Fix JSF < 2.1 compatibility issue

Issue: SWF-1622
Fix JSF < 2.2 compatibility issues

Issue: SWF-1634