refs #631, 632, had to change getHostsReplicatedTo to use a GTID
Make getLastError return members write was replicated to SERVER-4073

Conflicts:
	src/mongo/db/dbcommands.cpp
refs #632
SERVER-8263 Use member configs in local.slaves

Conflicts:
	src/mongo/db/repl.cpp
	src/mongo/db/repl_block.cpp
	src/mongo/db/repl_block.h
refs #632,
SERVER-8278 Change replicatedTo to writtenTo and add primary to list

Conflicts:
	src/mongo/db/dbcommands.cpp
	src/mongo/db/repl_block.cpp
	src/mongo/db/repl_block.h
refs #631, refs #632, compilation fixes from merge
SERVER-7099 "Syncing to: hostname" can appear in errmsg

Renamed errmsg to lastHearbeatMsg to better reflect the actual contents of the message.
SERVER-7380: make uassert 13419 consistent with permitted priority values
SERVER-7554 Report why a member is vetoing an election

Conflicts:
	src/mongo/db/repl/consensus.cpp
fix includes for health.*

Conflicts:
	src/mongo/db/repl/health.cpp
	src/mongo/db/repl/health.h
compilation fix from bad merge
SERVER-6037 always log missed heartbeats
SERVER-8507 replSetSyncFrom should fail gracefully when no replica set is active
SERVER-9003 - Display replica set chaining topology in rs.status()

Include syncingTo in heartbeat response and display this info for each
replica set member in the replSetGetStatus command.

Conflicts:
	src/mongo/db/repl/heartbeat.cpp
	src/mongo/db/repl/rs_member.h
fix issue in cherry-pick of 9412afa
SERVER-10724 better exception handling in health poll
fix compilation from cherry-pick
Merge branch 'bugfixes/tokumx-1.3'
compatibility version should actually be 2.4.7
Merge branch 'bugfixes/tokumx-1.3'

Conflicts:
	src/mongo/util/version.cpp