tree bad78cf68e581513d5558553dd724d7e8f6d6c73
parent 81bab452beb24d4daf3307596be6689acf9fcccf
parent d7efe52fcadd55b2bf5c1587ed4e3a5bf86e1169
author Dirk Rudolph <dirk.rudolph@netcentric.biz> 1515494344 +0100
committer Dirk Rudolph <dirk.rudolph@netcentric.biz> 1515494344 +0100

Merge remote-tracking branch 'upstream/master' into feature/SLING-7360

# Conflicts:
#	src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
#	src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
#	src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java