BUG: Option context applies on __enter__
Option context no longer overrides options when used outside a `with`
statement.

Added test TestConfig.test_option_config_scope

Closes #8514

All issues were addressed.  Thanks.
 Looking good for me!
 merging!
