Ensures the query is honored.  Also returns empty set in the situation w...

...hen there are no more entities to delete.

USERGRID-2358