SERVER-13812 Catch exception thrown by getShardsForQuery for geo query
(cherry picked from commit 16169267c6ece79e25f2722a50a3f915728fdb09)
SERVER-13839 circumvent reconfig in sync2.js
(cherry picked from commit 0779e3a8ed27ee72d3a03290856bc189c919957f)
Merge remote-tracking branch 'upstream/v2.6' into v2.6