Make use of .ndb.batch_batchmode to avoid affecting the builder (document this). Resolve #3688. Clean up OnDemandTasks' categories before saving, in case it was an object that was deleted
This reverts commit 06bc3c8bcd.
06bc3c8bcd