[#7103] Fixed stale project data issue from long-running imports and bulk edits

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>
[#7103] Fixed test failure

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>