[Bug 1141998] nvme_timeout fix not forward ported to 5.X ?