This makes it possible to re-use the existing values on an upgrade, merging in any new values set by `-f` or `--set`. Closes #1876
