NXP-10071 aligned to servlet api 3.0
NXP-10598 - Follow servlet-api artifactId renaming
Merge branch 'feature-NXP-10071'