checkpoint for fixes to test_mixed_modulestore.py.