SERVER-13603 Move option testing support code into shared test helper
Merge remote-tracking branch 'upstream/master'