Resolve conflicts with commons-logging and jcl-over-slf4j classes