merge-related break-fixes
even more log4j.xml changes