[releng] Issue #7979: Updates for rawhide containers