Reinstate imports from "JAL-1889 JAL-3130 patch broken tests" commit 05efc2ac3c6427a4...