Sweeping !2214 from master to LCG_105-patches: SPI-2547: update flake and friends See merge request !2215