ACCUMULO-3225 Replace dead ternary statement
ACCUMULO-3226 Remove unnecessary null check
Merge branch '1.5' into 1.6
ACCUMULO-3225 Remove dead ternary statement
Merge branch '1.6'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
ACCUMULO-3227 A bunch of string encoding issues.
Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Merge branch '1.5' into 1.6
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch '1.6'
ACCUMULO-3228 fix possible resource leaks
ACCUMULO-3228 fix possible resource leaks
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
ACCUMULO-3229 Format long as decimal integer, not floating-point
Merge branch '1.5' into 1.6
Merge branch '1.6'
ACCUMULO-3197 Remove deprecated Instance.getConfiguration()

  This patch removes the deprecated setter/getter which had poorly-defined
  behavior in previous versions, and was prone to incorrect use. It replaces it
  with a less risky getter on ZooKeeperInstance only, and refactors utility code
  with better names and documentation to help clarify correct usage and
  limitations. This mitigates some of the problems identified in ACCUMULO-3199,
  by removing the problematic deprecated public API methods while that issue
  awaits completion.
ACCUMULO-3230 Include Hadoop's jersey libs on the classpath.

The timeline client requires jersey and yarn jobs will fail to
submit without them.
Merge branch '1.5' into 1.6

Conflicts:
	assemble/conf/examples/vfs-classloader/accumulo-site.xml
	assemble/conf/templates/accumulo-site.xml
	conf/examples/1GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/standalone/accumulo-site.xml
	conf/examples/3GB/native-standalone/accumulo-site.xml
	conf/examples/3GB/standalone/accumulo-site.xml
	conf/examples/512MB/native-standalone/accumulo-site.xml
	conf/examples/512MB/standalone/accumulo-site.xml