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