ACCUMULO-2726 Adds back missing methods for binary backwards compat with non-Deprecated methods from 1.5.0. Marks things that we're for sure removing with @Deprecated; mostly things that shouldn't have been in public to begin with.
ACCUMULO-2734 Fix trivial javadoc bug
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2726 missed a deprecation for part of Mock.
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
	core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
	core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java
	core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
	shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
ACCUMULO-2171 Update CHANGES for 1.6.0-RC4

  This task also removes some previously added issues which were not actually
  addressed in that version.
ACCUMULO-2726 cleanup for master's branch.

* remove things we deprecated in 1.6.0 related to this ticket.
* make sure changes in the implementations in master are reflected in the new implementation locations
* make names in Mock consistent
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2745 Update README files with license headers

  Replaced readme.txt without a license header with a README that has one, for
  naming consistency.
ACCUMULO-2750 Remove unused state diagrams from docs module

  These files would be better suited on the website or in a wiki.
ACCUMULO-2751 Remove outdated ScaleTest.odp presentation

  This file would be better suited on the website somewhere, if kept at all.
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2680 Extend the timeout even more
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2742 offset history command by one

The history entries returned by the history command are 0-indexed,
while the history expansion is 1-indexed. We need to offset the index
when we print it so that users can accurately use event expansion.
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2752 Adding accidentally omitted getZooKeeperPort method
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2748 added logic to handle null keys for MockTableOperations.deleteRow

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
	core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java