Merge pull request #371 from vedujoshi/R1.06

Add a knob in sanity_params to verify_on_setup=True/False so that fixtur...
Fix merge issues from earlier commit