Merge pull request #3602 from henricm/fix-configuration-symlink-removed