Better handling of the default choices in case of upgrade (for some specific configurations of the installation wizard).
Better handling of the default choices in case of upgrade (for some specific configurations of the installation wizard).

ucbpi/itop,ucbpi/itop,ucbpi/itop,ucbpi/itop,ucbpi/itop