This MR replaces !MR38552
The code in !MR38552 damages some archaic code still running in various tests, but which had been removed as part of a clean-up.
This MR contains the changes in !MR38552 minus the removing of a number of files.
@jbossios @valentem @khoo @peter
ATR-22411