ACCUMULO-3012 Add missing serialVersionUID to new Exception
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3019 "Un-deprecate" ServerConfiguration

  Suppress all the unnecessary warnings noise due to the deprecation of this
  class without removing existing usage. One cannot reasonably consider it
  deprecated if we are still using it so extensively. This only applies to the
  current branch. It is deprecated in future branches. This commit should be
  merged to newer branches with the "ours" merge strategy.
Merge branch '1.6.1-SNAPSHOT'

  git merge -sours 1.6.1-SNAPSHOT
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