Merge branch 'gerrit/log4jfix-5e11053887'