SERVER-8897 Don't use non-portable variadic comma elision
Avoid tripping C++11 user defined literals
Examine return value of fail point to placate clang
SERVER-5099 Convert UTF-16 environment to UTF-8 in WindowsCommandLine

Implement support for the third parameter (environment) of main()/wmain()
and convert the Unicode environment strings to UTF-8.  Use the
environment parameter in mongo.exe.
SERVER-5099 Fix 32-bit signed/unsigned warnings
SERVER-8340 Fix some windows 64-bit compile warnings
SERVER-9153 Isolate synchronization primitives into one library
SERVER-7271 Do not exit if a transient config server error aborts a migration.

Conflicts:
	src/mongo/client/distlock.cpp
	src/mongo/s/d_migrate.cpp
	src/mongo/util/assert_util.h
SERVER-9072 add timed wait to Notifications
SERVER-9242 Use MONGO_INITIALIZERs to cache blockCheckSupported

Only cache values for blockCheckSupported() after the value has been
determined (for platforms, i.e. Windows, where this is a runtime test).

Conflicts:
	src/mongo/db/btree.cpp
	src/mongo/db/btree_stats.cpp
	src/mongo/db/btree_stats.h
	src/mongo/db/pdfile.h
	src/mongo/db/record.cpp
SERVER-8169 allow OpenSSL to interactively prompt for private key passphrase

I consolidated all the SSL Manager instances into one instance, so that the user is only prompted once
per process.
The prompt will only appear if the user supplies a certificate with a passphrase via --sslPEMKeyFile
and yet omits --sslPEMKeyPassword

Conflicts:
	src/mongo/util/net/ssl_manager.cpp
SERVER-8169 do not delete SSLManager singleton
SERVER-8536 correctly handle uasserts when doing queries in Index Rebuilder

Conflicts:
	src/mongo/db/index_rebuilder.cpp
SERVER-4739 use a thread for logRotate signal instead of a signal handler

Conflicts:
	src/mongo/db/db.cpp
	src/mongo/db/dbcommands_generic.cpp
	src/mongo/s/server.cpp
normalize #includes in many files

No behavior changes intended or expected.

Conflicts:
	src/mongo/db/cap.cpp
	src/mongo/db/collection.h
	src/mongo/db/compact.cpp
	src/mongo/db/cursor.h
	src/mongo/db/d_concurrency.cpp
	src/mongo/db/db.h
	src/mongo/db/dbeval.cpp
	src/mongo/db/dbmessage.h
	src/mongo/db/dbwebserver.cpp
	src/mongo/db/driverHelpers.cpp
	src/mongo/db/dur.cpp
	src/mongo/db/dur.h
	src/mongo/db/dur_commitjob.cpp
	src/mongo/db/dur_commitjob.h
	src/mongo/db/dur_journal.cpp
	src/mongo/db/dur_journalimpl.h
	src/mongo/db/dur_preplogbuffer.cpp
	src/mongo/db/dur_writetodatafiles.cpp
	src/mongo/db/durop.cpp
	src/mongo/db/durop.h
	src/mongo/db/flushtest.cpp
	src/mongo/db/instance.cpp
	src/mongo/db/instance.h
	src/mongo/db/jsobj.cpp
	src/mongo/db/jsobj.h
	src/mongo/db/mongommf.cpp
	src/mongo/db/mongommf.h
	src/mongo/db/pagefault.cpp
	src/mongo/db/repl/rs.h
	src/mongo/db/repl/rs_member.h
	src/mongo/db/repl/rs_rollback.cpp
	src/mongo/db/scanandorder.cpp
	src/mongo/db/scanandorder.h
	src/mongo/util/version.cpp
file/line for mutex name using only preprocessor
SERVER-8943 Remove hard limit of 20,000 incoming connections.
SERVER-9430 Split SSLManager into an abstract interface and hidden implementation

Conflicts:
	src/mongo/util/net/ssl_manager.cpp
SERVER-7974 Suppress stack trace on replication errors

Conflicts:
	src/mongo/db/repl/rs_sync.cpp
Include What You Use for bufreader.h