SERVER-10606 fix labeled level to correctly output space after label
SERVER-8886 Add OpenSSL license exception to util files

Conflicts:
	src/mongo/util/compress.cpp
	src/mongo/util/compress.h
	src/mongo/util/heapcheck.h
	src/mongo/util/logfile.cpp
	src/mongo/util/logfile.h
SERVER-9031 compile successfully without 'FIPS_mode_set' symbol
Fix assert code collision
SERVER-6407 When using PLAIN mechanism and $external database, do not digest password by default.

The only use of SASL PLAIN authentication against the $external database is for
LDAP proxy authentication, so this is the intelligent default choice in this scenario.

Conflicts:
	src/mongo/client/sasl_client_authenticate_impl.cpp
SERVER-10156 no digest password default for GSSAPI in the c++ driver
Create place for auth functions in client code and move password hashing there
SERVER-8864 Fixed failing unit test 'sock_test'
SERVER-8864 Fixed recv exception handling in httpClientTest and web server
SERVER-10678 Log a warning but do not throw when unable to determine local address of a socket.
SERVER-8510 Include name of top level section in help string and do not include hidden options
SERVER-8510 Handle default, implicit, and composing options in new configuration parser
SERVER-8510 Added better error messages for Value class and added underscores to member variables
SERVER-8510 Added legacy interface to Environment and Value to ease transition from variables_map
SERVER-8510 Allow a positional to be registered for a flag that has already been registered
SERVER-8510 Removed KeyNotFound error code

Conflicts:
	src/mongo/base/error_codes.err
SERVER-8510 Add function to extract only explicitly set values from Environment
SERVER-8510 Fix handling of options with a short name in option parsing
SERVER-8510 Added tests for dotted names in JSON config file parser
SERVER-8510 Remove forward declaration of Status in the wrong namespace