SERVER-11834 Remove lockType field from listCommands output
SERVER-12049 Redact sensitive data from slowms output
Merge remote-tracking branch 'upstream/master'