better retry/error handling for query handlers
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'
better retry policy and better error handling
reduce operation count in IntegrationBenchmarkExecutionApiTest.java readwrite test to avoid failure from excessive isolation related retries
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'