SERVER-8416 Lock around replica set state changes
SERVER-8630 Log the actual error message when getnonce fails
SERVER-7604 deny access to system.users to read-only users through mongos
SERVER-6591 Fix localhost auth exception in sharded systems
SERVER-6591 Don't query config server when running with noauth
SERVER-6591: added tests for bypassing authentication when connected with a localhost to a server that has no admin users.
SERVER-6591 Fix test
SERVER-6591 Fix localhostAuthBypass tests to work on 2.2, where GLE requires auth to run
SERVER-8786 Make sure that the ShardingConnectionHook gets added to the connection pools anytime sharding is initialized
SERVER-8786 Fix race condition when adding ShardingConnectionHook to connection pools
fix mongostat --discover with mongos
SERVER-8771 Additional fix for mongostat --discover with mongos
make remove2 more reliable
try to make sharding tests more reliable when needing balancing to be done
SERVER-7231 Use ternary operator in LOG() macro and add necessary comparison operators
SERVER-7231 Use LOG(level) macro instead of log(level) function

Conflicts:
	src/mongo/client/distlock.cpp
	src/mongo/db/geo/haystack.cpp
	src/mongo/db/pdfile.cpp
	src/mongo/db/queryoptimizer.cpp
	src/mongo/db/repl/rs.cpp
	src/mongo/s/config.cpp
SERVER-7231 Removed log(level) functions
SERVER-7231 Construct log helper variables only when they will be logged
SERVER-7231 Fixed cases where LOG(level) macro is used with booleans

Conflicts:
	src/mongo/s/strategy_shard.cpp
Return nullstream in don't-log case of MONGO_LOG