ACCUMULO-1961 Fix warnings
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT