Merge -r 1406998:1406999 from trunk to branch-2. Fixes: YARN-169. Update log4j.appender.EventCounter to use org.apache.hadoop.log.metrics.EventCounter. Contributed by Anthony Rojas.