changelog ordering fix post-upstream-merge to get release ordering right