SERVER-12167 properly shutdown replsetTest bridges
Merge remote-tracking branch 'upstream/master'