Moved log4j and apache deps into the addons that depend on them