Fix for ordering problem during package removal resulting dangling symlinks, partially fixes #1675
Proposed fix for #1675
Merge remote-tracking branch 'miklosm/iss1675.1'
Merge remote-tracking branch 'miklosm/iss1675.2'