Treat domain_scope= the same as app_scope=

[merge]