MAPREDUCE-5883. "Total megabyte-seconds" in job counters is slightly misleading. Contributed by Nathan Roberts

(cherry picked from commit cab3c7c8892ad33a7eb0955b01e99872ab95e192)

Conflicts:

	hadoop-mapreduce-project/CHANGES.txt

hadoop-mapreduce-project/CHANGES.txt

@@ -32,6 +32,9 @@ Release 2.6.3 - UNRELEASED
     position/key information for uncompressed input sometimes. (Zhihai Xu via
     jlowe)
 
+    MAPREDUCE-5883. "Total megabyte-seconds" in job counters is slightly
+    misleading (Nathan Roberts via jlowe)
+
 Release 2.6.2 - 2015-10-28
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/org/apache/hadoop/mapreduce/JobCounter.properties

@@ -27,9 +27,9 @@ SLOTS_MILLIS_MAPS.name=            Total time spent by all maps in occupied slot
 SLOTS_MILLIS_REDUCES.name=         Total time spent by all reduces in occupied slots (ms)
 MILLIS_MAPS.name=                  Total time spent by all map tasks (ms)
 MILLIS_REDUCES.name=               Total time spent by all reduce tasks (ms)
-MB_MILLIS_MAPS.name=               Total megabyte-seconds taken by all map tasks
-MB_MILLIS_REDUCES.name=            Total megabyte-seconds taken by all reduce tasks
-VCORES_MILLIS_MAPS.name=           Total vcore-seconds taken by all map tasks
-VCORES_MILLIS_REDUCES.name=        Total vcore-seconds taken by all reduce tasks
+MB_MILLIS_MAPS.name=               Total megabyte-milliseconds taken by all map tasks
+MB_MILLIS_REDUCES.name=            Total megabyte-milliseconds taken by all reduce tasks
+VCORES_MILLIS_MAPS.name=           Total vcore-milliseconds taken by all map tasks
+VCORES_MILLIS_REDUCES.name=        Total vcore-milliseconds taken by all reduce tasks
 FALLOW_SLOTS_MILLIS_MAPS.name=     Total time spent by all maps waiting after reserving slots (ms)
 FALLOW_SLOTS_MILLIS_REDUCES.name=  Total time spent by all reduces waiting after reserving slots (ms)