Add settings file discard behaviour
Fix propagation of the update flag to secondary uninstall process + testing
Merge pull request #2823 from Conceptual-Design/RC0.7.3_master

Cross merge pull request #2800 to RC073