SERVER-13812 Catch exception thrown by getShardsForQuery for geo query
Merge remote-tracking branch 'upstream/master'