More fixes to Core Persistence and CpEntityManager, all IndexIT tests now pass.