0126fd4
Fix changelog to keep rhel history Do not overwrite rhel history with history of upstream we rebase to. Also include commits added after rebase. Related: rhbz#1691319