Fix of getClient for scatter/gather and search

RB=237507
R=dhoa,osumampo,sihde,si-dev
A=dhoa