Rebase patches.

Also, Remove requirements.txt and test-requirements.txt via the RPM spec
file instead of patch files (this is more robust).