ACCUMULO-802 Apply Sean Hickey's patch (v5)