The Enzo e Dino Ferrari International Circuit in Imola is to remain on the calendar until 2025 as F1 bosses agree new deal.