Some minor merges, disable a test on IBM JDK