ENG-5947 ENG-5948 Misc. catalog upgrade fixes/tweaks.
Merge branch 'master' of github.com:VoltDB/voltdb