ACCUMULO-1961 Fix warnings