SERVER-14799 fix mistake in hint for count patch
Merge remote-tracking branch 'upstream/v2.6' into v2.6