Merge "Add Ubuntu patch to work around OpenJDK bug"