WELD-948 More JSF dependencies fixes