Final fixes for the java-utils-2.eclass