Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
ACCUMULO-2292 Fix a potential bug in the InputFormat that I introduced.
ACCUMULO-2292 Massive amount of fixes for findbugs warnings.

The strong majority of these changes are all UTF8 related. The rest are split up between
using Long.valueOf and Integer.valueOf, Map.entrySet() instead of Map.keySet(),
unnecessary String creation/concatenation, and useless conditionals.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
	core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
	core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
	core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
	core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
	core/src/main/java/org/apache/accumulo/core/client/impl/Writer.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/client/mapreduce/RangeInputSplit.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
	core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
	core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java
	core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
	core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
	core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
	core/src/main/java/org/apache/accumulo/core/util/Merge.java
	core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java
	core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserPermissionsCommand.java
	fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
	fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
	fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
	proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
	server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
	server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
	server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
	server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
	server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
	server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
	server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.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/tables/TableManager.java
	server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
	server/base/src/main/java/org/apache/accumulo/server/util/Info.java
	server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
	server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
	server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
	server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
	server/src/main/java/org/apache/accumulo/server/master/Master.java
	server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
	server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
	server/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/Compactor.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
	start/src/main/java/org/apache/accumulo/start/classloader/vfs/PostDelegatingVFSClassLoader.java
	test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
	test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
	test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
	test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java
	test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java
	test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
	test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
	test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
	test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
	test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
	test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
	test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java
	test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
	test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
	test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
	test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
	test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
	core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
ACCUMULO-2273 Use guava's Joiner instead of writing our own

Signed-off-by: Bill Havanki <bhavanki@cloudera.com>