FORGE-1824: Yet even more updates to address classpath isolation