Rename servlet 2 web app test application

[#60255008]
Merge 60255008- to master

[Completes #60255008]