SERVER-10242 Make uassertStatusOK() an inline function instead of a macro.
SERVER-1891 Clean up includes some in sock.h and listen.h.

Conflicts:
	src/mongo/util/net/listen.h
SERVER-10234 Disable legacy SSL versions

Conflicts:
	src/mongo/util/net/ssl_manager.cpp
SERVER-1891 Make it possible to get the local and remote SockAddr from an AbstractMessagingPort.
added missing assert number
SERVER-9072 remove bad timed_wait code from Notification
SERVER-10316 Account for milliseconds component of date in RamLog::repeats.
SERVER-10314 Make logger format RamLog lines like console log lines.
SERVER-7965 Introduce time formatting functions for ISO 8601 and Ctime; eliminate curTimeString().
SERVER-7965 Construct MessageEventEphemeral with a time stamp; use that when printing log messages.
SERVER-9468 Move s/field-parser* to db/

Conflicts:
	src/mongo/db/range_deleter_stat_test.cpp
	src/mongo/db/range_deleter_test.cpp
	src/mongo/s/commands_admin.cpp
	src/mongo/s/d_migrate.cpp
SERVER-7965 Move date/time types and functions from bson/util/misc.h to util/time_support.{h,cpp}.

Conflicts:
	src/mongo/util/optime.h
SERVER-10181 Stop looking up stack when hitting an exempt constructor
SERVER-7965 Fix time_support and time_support_test windows build errors.

This includes manually constructing the timezone offset in ISO 8601 formatted
local times.
SERVER-7965 Fix time_support_test for systems with small (signed, 32-bit) time_t.
Fix SERVER-10332 for Andy
SERVER-7965 Make the timestamp format settable in servers.

From the command line or config file, --logTimestampFormat=(ctime|iso8601-utc|iso8601-local).

The beginning of the Unix Epoch is formatted as follows in the three formats,
assuming America/New_York for the time zone.

  ctime:         Wed Dec 31 19:00:00.000
  iso8601-utc:   1970-01-01T00:00:00.000Z
  iso8601-local: 1969-12-31T19:00:00.000+0500

The default remains the same as in prior versions, "ctime".
SERVER-8364 added OpenSSL version information to mongod SERVER-8364 fixed a typo

Signed-off-by: Matt Kangas <matt.kangas@10gen.com>

Conflicts:
	src/mongo/dbtests/perftests.cpp
	src/mongo/s/server.cpp
	src/mongo/util/version.cpp
SERVER-10428 fassert on C runtime failures in Windows debug build
Remove some unmmaintained utilities and tests

Conflicts:
	src/mongo/SConscript
	src/mongo/tools/docgeneratormain.cpp
	src/mongo/tools/loadgenerator.cpp