python2: Rebase patches onto 2.7.8