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
add blank lines between the different sections (eg where u start with a comment; easier to read that way); add the issue number as a comment at the top of the test