Interestingly the /dev/disk/by-id/scsi-SATA_Samsung_SSD_840_S1AXNSAF418336R (in grub_installdevice.old) gets renamed to /dev/disk/by-id/scsi-SATA_Samsung_SSD_840S1AXNSAF418336R (in newer grub_installdevice).