FACES-1486
Upgrade to JSF 2.1 API