SERVER-15535 add version 2 to generated oplog document
SERVER-15535 ensure reconfig worked
Merge remote-tracking branch 'upstream/master'