fixup! Fix some monkey-patches to make them compatible with ZODB5

2 jobs for for_testrunner_1
Status Job ID Name Coverage
  External
passed SlapOS.Eggs.UnitTest-Master.Python2

passed SlapOS.Eggs.UnitTest-Master.Python3