Separate Mojarra Upgrade and JSF Deployment config into separate sections