Merged various Red Hat fixes
1 file changed