merge MAPREDUCE-4971 from trunk. Minor extensibility enhancements to Counters & FileOutputFormat. Contributed by Arun C Murthy


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441672 13f79535-47bb-0310-9956-ffa450edef68