Backport the fixes for package updates to releng/10.0