updated patches for current 2.1 head

upstream ruby has incorporated some of the fixes in 2.1. head branch, so I had to remove them.

can you please merge?