ACCUMULO-3225 Replace dead ternary statement
ACCUMULO-3226 Remove unnecessary null check
Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5