Applied patch for ACCUMULO-1889.