Merge changes from the main branch. Remove the attempted merge with UnknownElement - while it would be nice, it's not possible without affecting backward compat ( since tasks could use both of them ).
ant/core/trunk/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java