[AAI] Log4j changes moved to the Istanbul branch