(21596) pre-suite when set in options.rb is overwritten by default,
merge defaults after merging file options
Merge pull request #487 from anodelman/overwritten-options

(21596) pre-suite when set in options.rb is overwritten by default