APF-1239: Finished moving from SiteMesh to Facelets for JSF