Remove outdated references to ContextLoaderServlet

Issue: SPR-7725
(cherry picked from commit 69998e3)
Polishing