[OS-BUILD PATCH] Combine Red Hat patches into single patch