SERVER-16313 do not abort for non-mongod with wiredtiger options
Merge remote-tracking branch 'upstream/master'