fixes error with concurrent merge and bulk import#5850

keith-turner wants to merge 2 commits intoapache:mainapache/accumulo:mainfrom

keith-turner:fix-bulk-bugkeith-turner/accumulo:fix-bulk-bugCopy head branch name to clipboard