ACCUMULO-2468 Remove recently introduced warnings
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2490 Make Pair API more generics-friendly
ACCUMULO-2477, ACCUMULO-2187 Fix introduced warnings/formatting