Update ChangeLog with information about the merged el7 branch