CORE-1920 includeAll is not including files

Not ready for automated spring tests, yet