ISPN-3279 Removed ConfigurationOverrides and GlobalConfigurationOverrides
ISPN-3279 Made some other test modifications, one still fails.