Rewriting history to the Katello one seems odd for us upstream, could we keep our upstream changelog?