More progress on getting tests passing with the new CpEntityManager.
Merge branch 'two-dot-o' into USERGRID-139_delete-entities