[rhel7-branch 1/1] Use the index in grubenv (#1209678)