[DS-1744] Upgrade to latest log4j