SERVER-12887: change order of syslog options in help

Signed-off-by: Matt Kangas <matt.kangas@mongodb.com>
SERVER-12127 migrate js tests to jscore suite when not related to writes

exclude error1.js from sharding passthrough
Merge remote-tracking branch 'upstream/master'