NXP-10071 aligned to servlet api 3.0