more deadlock work
SERVER-14403 translate w:'majority' to be internal tag pattern '$majority'
SERVER-15535 properly update lastVote when we vote for ourselves
SERVER 14425: DeadLock exception class and beginnings of automatic retry
SERVER-15718 fix error code for count
SERVER-15677 Make sure heartbeat reconfig thread is joined before shutting down
 SERVER-15730 New top chunk logic can decide to moveChunk when it didn't before in auto1.js
SERVER 14425: add license header to deadlock.h
SERVER-15714: change empty collection name from invariant to massert
Merge remote-tracking branch 'root/master'

Conflicts:
	src/mongo/db/commands/write_commands/batch_executor.cpp
	src/mongo/db/concurrency/deadlock.h
	src/mongo/db/instance.cpp