Fix IMMUTANT-489 (again) by uniquely naming servlets