ENG-5941 Fix recovery breakage due to new catalog version check.
Merge branch 'master' of github.com:VoltDB/voltdb
Merge branch 'master' into DIST