Update rebased patches

Package-Manager: portage-2.2.0_alpha170
RepoMan-Options: --force
Merge remote-tracking branch 'github/master'