I'm a little confused about the changes to the upgrade test xml sources here.  IIUC these are to test upgrading... so shouldn't it have done the correct thing as part of the test execution to apply these changes to the configuration?