Reverted back to JavaEE6 for JSF 2.1 compatibility, minor fixes to templates