[OS-BUILD PATCHv3 4/8] redhat: always add a rebase entry when ark merges from upstream