SERVER-15564 Send config version and member ID with every replSetUpdatePosition command and use the given member ID if there hasn't been a handshake
SERVER-14734 Send exactly one replSetUpdatePosition command upstream per replSetUpdatePosition command received
SERVER-15565 Prefer member IDs to RIDs for identifing secondaries for tracking replication progress
SERVER-15565 Avoid iterating _slaveInfo when updating member optimes based on heartbeat response
SERVER-15781 Separate the concepts of next electable time and step-down until in replication.

The topology coordinator needs to track two distinct notions of a node not being
willing to stand for election.  The first is that of the step-down period.
During the step down period, the node will not stand for election due to the
step-down command being issued.  In heartbeat responses, nodes in the step down
period should report that they are not electable.

The second notion is that of the post election sleep period.  If a node loses an
election, it declines to stand again for a brief period of time (1 second plus a
random interval), to avert problems related to ties.  During this period, its
heartbeat responses should still report the node is electable, to suppress the
election of lower priority nodes.
SERVER-15535 Consider return value of setFollowerMode in call sites that care.
SERVER-15567 Add test confirming streaming into FAIL() macro.
Add copyright to heap1_engine_test.cpp
SERVER-15792: check collection name in count command

Also updates jstest to test this.
SERVER-15527 fix compile
SERVER-15810: Check for valid collection names in aggregation

Add new aggregation test for this.
SERVER-15443 Add information from slave tracking map to server status 'repl' section
SERVER-15820 Include rollback ID in serverStatus 'repl' section
SERVER-15823 Ensure rollback ID is always positive
SERVER-15714: Use massert on invalid db/ns lock attempt

This generally indicates a malformed command, so shouldn't shutdown server.
SERVER-15564 Fix unused variable warnings in test
SERVER-15810: temporarily disable problematic assert in test
default to btree
Merge remote-tracking branch 'root/master'
assert codes