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'