Upgrade to java 2.1-RC4