NXP-12157: format
NXP-12157: add missing dep to servlet-api
NXP-12157 - cleanup & format