fixed tomcat assembly to remove jsp-api jar and ensure that correct context.xml will be packaged
(cherry picked from commit 81a6911493ab4984b8a1fab6a0d9de2da230fd30)