SERVER-13644 Fix command line censorship
(cherry picked from commit b1d30046c769ed625faf301c8b62186c4aeee86e)
Merge remote-tracking branch 'upstream/v2.6' into v2.6