For Eng-6369, fix a broken testcase.
For ENG-6369, changes based on code review.
Merge pull request #1472 from VoltDB/ENG-6369-flow-control

For Eng-6369, fix a broken testcase.