ENG-6533: When we upgrade the initial catalog, use the bytes from the
upgraded catalog to create the node's CatalogContext, not the
pre-upgraded bytes.
ENG-6533: Cleanup, remove unused argument from
loadAndUpgradeCatalogFromJar.
Merge remote-tracking branch 'origin/master' into eng6533

Conflicts:
	src/frontend/org/voltdb/Inits.java
Merge pull request #1447 from VoltDB/eng6533

ENG-6533: When we upgrade the initial catalog, use the bytes from the upgraded catalog, not the pre-upgraded catalog.  r=wweiss