SERVER-15836 Change how long we wait for the master in rollback4.js.

In the legacy implementation of replication, the newly elected node waits for
queued oplog entries to drain before transitioning to primary.  In the new
implementation, it transitions immediately, but does not report "ismaster: true"
until the drain completes.
SERVER-15590 remove unneeded minor version tracking from heuristics
SERVER-15590 dead ShardConnection::runCommand code
SERVER-15531 serverID for WBL no longer used
Merge remote-tracking branch 'upstream/master'