ACCUMULO-3119 Cleanup javadocs in 1.5.x branch
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-3078 Re-introduce warnings suppression for Job()

  Adds warning suppression needed to build against the Hadoop
  version declared as a dependency, by default.
ACCUMULO-3093 Remove unused import
ACCUMULO-2645 Remove unused imports
ACCUMULO-3078 Fix ConditionalWriterIT trace test

  Discovered by "dead code" warning.
ACCUMULO-3119 Cleanup javadocs in 1.6.x branch
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
	shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
	test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'