Re-enable upgrade functionality for all configurations

Merged Julian Ospald requested to merge reenable-upgrade into master

But allow to disable in-place upgrades.

Merge request reports