Merge -c 1480447 from branch-1 to branch-1.2 to fix MAPREDUCE-5148. Fix MAPREDUCE-4970 to ensure task-log4j.properties is available for previous installs by putting it in hadoop-core.jar. Contributed by Arun C. Murthy.
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/build.xml