I applied the patches using manual copy/paste/fix, and pushed them as 5302cfab43ed5e1b9f41a00663564dabb35503d2 and following.