Increase assertion range to stop random test failures.

Closes #3417989

added 12 commits

• f472719f...501e1ed2 - 11 commits from branch project:11.x
• ffd73044 - Increase maximum query count to 17.

Compare with previous version

closed