fixes for md and sc tests, ReplSetTest rs and other opts

also cleanup