JSF added to maven structure. Moved to newer versions, cleanup.