ACCUMULO-3167 Fix compilation issues.