NXP-12157 add missing dependency
NXP-12157 mark servlet-api as provided
NXP-12157 - cleanup & format