Merge pull request #4423 from jestabro/preserve-symlinks
T7294: preserve /config symlinks on image upgrade