Moved some utility methods from DatabaseUtil to UpgradeUtil