ACCUMULO-1920 fix needs to be in 1.4 branch, too