PM-696: handle cleanup of symlinks the same way as cleanup if files
Merge branch '4.2' - PM-696: cleanup symlinks the same was as files