ACCUMULO-3048 Add in new fixes after rc0
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	CHANGES
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3013 Remove unused import left behind.
ACCUMULO-2967 Remove warning from unused assignment
ACCUMULO-3058 Remove broken javadoc line

  Removes incorrect instructions referencing non-existent methods.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
	test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java