SERVER-16209 jstest fixes
Merge remote-tracking branch 'upstream/master'