ACCUMULO-2261 cherry pick back 1.5
ACCUMULO-1961 removing trivial warnings