Merge branch 'master' into ENG-5986
Merge branch 'master' into ENG-5986
ENG-5986: fix ENG-4168 and similar behavior seen here.
ENG-5986: Guard copydeletetask to let load complete.
Merge pull request #1214 from VoltDB/ENG-5986

Eng 5986