ENG-5616 Correct and beef up index selection tests
ENG-5774 and (dup) ENG-4736 one-liner to avoid updateCatalog NPE deep within hsql re-init
Merge pull request #1130 from VoltDB/ENG-5774-intermittent-hsql-npe

ENG-5774 and (dup) ENG-4736 one-liner to avoid updateCatalog NPE deep wi...