I adapted the patches to the latest 1.6.6 source code (17. 07. 2015 0600GMT) and they are working.
I put them here: --- Base.java Thu Jul 16 07:20:16 2015+++ Base.java Thu Jul 16 21:35:24 2015 - Pastebin.com
I also posted that on GitHub but somebody needs to do the merge request.