use new patch directory convention for ruby 2.1
Merge pull request #2580 from skaes/new-2-1-head-patch-convention

use new patch directory convention for ruby 2.1