EDIT

ref #10072, ref #2934 adapt some log4j2(-test).xml in cdmlib

ref #10072 fix LogUtilsTest after correct use of log4j2.xml

ref #10072 rename log4j.xml to log4j2.xml in cdmlib

cleanup

ref #10141 fix CCE in LogUtils.setLevel()

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 5.33.0-SNAPSHOT development

fix log4j.xml

cleanup and javadoc