FL-359 merged grub slots to avoid file collisions during update, removed obsolete comment