X pickle -> zodbpickle to be able to work with protocol=3

nexedi/slapos!839 (comment 119084)

neo/storage/database/importer.py

@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import cPickle, pickle, sys, time
+from zodbpickle import slowpickle as pickle, fastpickle as cPickle
+import sys, time
 from bisect import bisect, insort
 from collections import deque
 from cStringIO import StringIO

neo/tests/threaded/testImporter.py

@@ -320,11 +320,6 @@ class ImporterTests(NEOThreadedTest):
             (lambda path: path[0] not in multi or len(path) == 1),
             (lambda db: lambda path: path[0] in (db, 4)))
 
-    if getattr(serialize, '_protocol', 1) > 1:
-        # XXX: With ZODB5, we should at least keep a working test that does not
-        #      merge several DB.
-        testMerge = expectedFailure(NEOPrimaryMasterLost)(testMerge)
-
     def testIncremental(self):
         """
         This reproduces an undocumented way to speed up the import of a single

setup.py

@@ -44,7 +44,7 @@ get3rdParty(x, '3rdparty/' + x, 'https://lab.nexedi.com/nexedi/erp5'
     '/raw/14b0fcdcc31c5791646f9590678ca028f5d221f5/product/ERP5Type/' + x,
     'abb7970856540fd02150edd1fa9a3a3e8d0074ec526ab189684ef7ea9b41825f')
 
-zodb_require = ['ZODB3>=3.10dev']
+zodb_require = ['ZODB3>=3.10dev', 'zodbpickle<2']
 
 extras_require = {
     'admin': [],