updating patches, v5 upstream

Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>