Backport ENG-6533 fix:

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.

squashed:
git cherry-pick 77f56cee87af5d068593893245c92c8e5ce41c75
git cherry-pick 6afe6ea0114886a216c7345237a9c555713df917

Fix import issue.