Fix issue with JSF < 2.1 compatibility

Issue: SWF-1622