Keep non-batch query parameters in ScatterGatherBuilder.

RB=310721
R=gogenc,jbetz,si-dev
A=jbetz,fastier