Cherry pick fix for ENG-6635
Merge pull request #1532 from VoltDB/ENG-6635-index-drop-4.0.1.x

Manually tested fix for ENG-6635 ensuring drop of EE index.