So, this enclosing if condition also goes away.  This probably means that m_forceCatalogUpgrade can be expunged from VoltDB.Configuration as well.