4c8469c
tweak configs used by tests - tweak configuration files used during tests to try to reduce the number of conflicts encountered when builds for multiple arches land on the same builder