Addenum for HDFS-5309, update binary edits again

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1530410 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5304. Expose if a block replica is cached in getFileBlockLocations. (Contributed by Andrew Wang)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1530802 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'HDFS-4949' into HDFS-5224
HDFS-5224: bring back EmptyPathError