HADOOP-5126. Merge -r 737943:737944 from trunk to branch 0.19.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@740115 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -11,6 +11,8 @@ Release 0.19.1 - Unreleased
 
     HADOOP-3894. DFSClient logging improvements. (Steve Loughran via shv)
 
+    HADOOP-5126. Remove empty file BlocksWithLocations.java (shv)
+
   BUG FIXES
 
     HADOOP-4697. Fix getBlockLocations in KosmosFileSystem to handle multiple