ACCUMULO-2037 Close scanner
ACCUMULO-3068 ACCUMULO-2558 Fix incorrect/incomplete javadocs
ACCUMULO-3081 Removed commented-out code

  The code looked out of date, and did not compile, so I could not leave in the
  unused tests with @Ignore. The tests can be reintroduced later, if needed.
ACCUMULO-2615 and others - cleanup warnings

  Cleanup unused imports/fields, and deprecation warnings leftover from 2615, as
  well as ACCUMULO-2694, ACCUMULO-2988, ACCUMULO-3017, and ACCUMULO-3055
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
	server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java
	server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
	server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
	server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
	server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
	test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java