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