Code review tweaks for InsecureSkipVerify support

@myleshorton Some suggested changes to your changes
Added condition to make sure that our original config remains untouched.