Merge "Improve installclean to catch more installed files"