[nvidia-persistenced/el8: 6/6] Merge branch 'el9' into el8