Upgrade javax.servlet API version
Refactored profiles and fixed deployment context dependency