[releng] PR #7646: FTBFS fixes