Upstream now has a generic RuleBasedConfigurator with different argument name for the scope, update our code to match the new names.
Upstream now has a generic RuleBasedConfigurator with different argument name for the scope, update our code to match the new names.