Ensures the query is honored.  Also returns empty set in the situation when there are no more entities to delete.

USERGRID-2358
Merge pull request #227 from apigee/USERGRID-2358

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