SERVER-13203 replset2.js no longer swallows exceptions or assertions
SERVER-13477 make rollback5.js less likely to fail due to its assumption about which node is primary
Merge remote-tracking branch 'upstream/master'