ENG-12666: Fix startup catalog causing junit to fail. (#4613)
ENG-12666: Fix startup catalog causing junit to fail. (#4613)

Previous merge is failing to revert.
VoltDB/voltdb,deerwalk/voltdb,VoltDB/voltdb,simonzhangsm/voltdb,simonzhangsm/voltdb,deerwalk/voltdb,deerwalk/voltdb,deerwalk/voltdb,VoltDB/voltdb,deerwalk/voltdb,deerwalk/voltdb,deerwalk/voltdb,simonzhangsm/voltdb,VoltDB/voltdb,simonzhangsm/voltdb,VoltDB/voltdb,simonzhangsm/voltdb,deerwalk/voltdb,simonzhangsm/voltdb,simonzhangsm/voltdb,VoltDB/voltdb,VoltDB/voltdb,simonzhangsm/voltdb