In the meantime, if you were getting a whitespace error when applying the patches, can I ask how you were doing that? I replayed mine given the branch point commit ID and didn't see any errors.
I use "git apply <patch>" or "git am <patch>". I checked again today on