Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/Constants.java
core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java
core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
server/src/main/java/org/apache/accumulo/server/metanalysis/LogFileOutputFormat.java
server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
