Merge "Remove redundant closure for all packageFiles with own directory"