Whatif hooked up to environment doctoring
Merge pull request #3016 from christav/more-doctoring

Whatif hooked up to environment doctoring