ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner
Merge branch '1.5' into 1.6
Merge branch '1.6'