Merge branch '2.1' into 3.1

Author: keith-turner

core/src/main/java/org/apache/accumulo/core/fate/zookeeper/FateLock.java

@@ -103,9 +103,9 @@ public SortedMap<Long,byte[]> getEarlierEntries(long entry) {
       for (String name : children) {
         // this try catch must be done inside the loop because some subset of the children may exist
         try {
-          byte[] data = zoo.getData(path + "/" + name);
           long order = Long.parseLong(name.substring(PREFIX.length()));
           if (order <= entry) {
+            byte[] data = zoo.getData(path + "/" + name);
             result.put(order, data);
           }
         } catch (KeeperException.NoNodeException ex) {