ACCUMULO-1872 Remove compiler warnings
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT