Merge conflict causing a test failure in test-py-deephaven2

[niloc132]

  ======================================================================
  ERROR [0.005s]: test_calendar (unittest.loader._FailedTest)
  ----------------------------------------------------------------------
  ImportError: Failed to import test module: test_calendar
  Traceback (most recent call last):
    File "/usr/lib/python3.7/unittest/loader.py", line 436, in _find_test_path
      module = self._get_module_from_name(name)
    File "/usr/lib/python3.7/unittest/loader.py", line 377, in _get_module_from_name
      __import__(name)
    File "/python/tests/test_calendar.py", line 8, in <module>
      from deephaven2.calendar import calendar_names, default_calendar_name, BusinessCalendar, DayOfWeek
    File "/python/deephaven2/calendar.py", line 13, in <module>
      from deephaven2._wrapper_abc import JObjectWrapper
  ModuleNotFoundError: No module named 'deephaven2._wrapper_abc'
  
  
  ----------------------------------------------------------------------

It appears that #2013 and #2031 conflicted, but not in a way that git detected, and so github did not force the latter to be rebased/merged up to date before landing it, so CI checks didn't catch the failure.