SERVER-12274 revert incorrect test changes to server7781.js
Merge remote-tracking branch 'upstream/master'