Make all necessary changes for combining old and new servlets

No match.