GSG: Attempt to fix some suspected race / thread issues on bamboo test builds.