Resending - Fixing CARBON-14970 - Update log4j and apache-commons-logging dependency