APF-1239: Replaced SiteMesh with JSF Layout