HH-48866 remove Tornado2 backwards compatible code
HH-48866 service_mock improvements