LPS-44150

Hey @jon. I had to test this on ec64e0b because I'm having problems running tomcat on the latest master. There is still another problem that exists on LPS-45136 but it is a separate issue from this bug. I'll look into that one next.