SERVER-13334 fix maxTimeMS shell helper with count
Merge remote-tracking branch 'upstream/master'