SERVER-7596 Fixed error number
SERVER-15045 extend logComponentVerbosity to support less verbose BSON format for log component severity
Merge remote-tracking branch 'upstream/master'