backports: remove two upstream patches

Two changes to help with backports were merged upstream so nuke 'em.

Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
2 files changed