SERVER-14680 cannot use limits::max() with boost::time_duration
SERVER-14680 merge in changes to topocoord interface
SERVER-14429 Don't change replSettings.master after startup
SERVER-14429 Don't change replSettings.fastsync after startup
SERVER-14462 Add back desc and threadId to currentOp() output

This doesn't fully fix the bug, because the LockState information is still
missing, but adds everything except for that.
SERVER-14448 Fix race condition in test
SERVER-14821 Update Merge Module for building MSI's in VS2013
 SERVER-14561: remove member heartbeat ping data
SERVER-14561: rename replCoord topoCoord callbacks and make private
SERVER-14681 update storage FAQ
SERVER-6771: Windows Service: 'net stop mongodb' gives System error 109 has occurred. -- The pipe has been ended.
SERVER-13338: NT Service does not return failure code on exit
SERVER-14728 Shard depends on string comparison of replica set connection string
SERVER-14448 Fix Date handling in replSetGetStatus
SERVER-14442 Fix handling of "self" when preparing replSetUpdatePosition commands
Revert "SERVER-14728 Shard depends on string comparison of replica set connection string"

This reverts commit b3787777795434829a3b512c06b5a0a508d81467.
SERVER-14825 Add utility methods to C++ unit tests for capturing and examining log messages.
SERVER-14788 Get isSelf functionality from ReplCoordinatorExternalState in parseReplSetSeedList.

This makes parseReplSetSeedList usable in ReplicationCoordinatorImpl.
SERVER-14788 Simplify the fixture for running tests in repl_coordinator_impl_test.

These simplifications remove some memory leaks and make it easier to follow the initialization
logic.  This is prerequisite to changes testing the loading local configurations during
startReplication().
SERVER-14506 special top chunk logic can move max chunk to a shard with incompatible tag

Make DistributionStatus store ChunkTypes instead of BSONObj
SERVER-14506 special top chunk logic can move max chunk to a shard with incompatible tag