Add the patch from #35395 to reduce the number of hoops to jump through when filtering installed files. I suspect we'll still need to filter out the src.zip bundles, for instance.
Paul: Created new bug about this, as it's a separate issue. I'll get to it.
Fixed. Didn't bump rev, as nothing was supposed to change:)