Merge pull request #1125 from VoltDB/ENG-5712

ENG-5712 Automatic catalog upgrade
Merge remote-tracking branch 'origin/master' into ENG-5711
ENG-5711: Self-reviewed cleanup.