ENG-5310 - test review changes.
Commits missed in merge pull requests.
Merge pull request #873 from VoltDB/ENG-5310-last-batch-drain

Eng 5310 last batch drain