Fixing a merge problem
Switching to the log4j2 logging mechanism
Removing transitive dependencies on commons-logging

Added a dependency on jcl-over-slf4j, because we need that
Working on this some, it doesn't pass yet, because now the log4j stuff
is not relative :(