Prepare for Java EE 7 and JSF 2.2