SERVER-4217 use hyphen to display default component in log message
Merge remote-tracking branch 'upstream/master'