Merge branch 'master' of https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests