SERVER-14403 translate w:'majority' to be internal tag pattern '$majority'
SERVER-15535 properly update lastVote when we vote for ourselves
Merge remote-tracking branch 'upstream/master'