Merge from HEAD Zip task would not zip filesets containing only empty dirs PR: 30365 Submitted by: Matt Benson