fix merge misses tested by millert, mbalmer and me; ok grange, mickey
fix merge misses
tested by millert, mbalmer and me; ok grange, mickey

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars