Py3: tests should not depend on mock
Tox: pypy3 must use test3.txt, not test.txt
Merge branch 'master' of github.com:celery/celery