Add patches for JDK 1.5 errors
Update for v6.3~svn698-2