Merge branch 'jenkins-build-6' into 'master'

Auto-merge for build 6

See merge request puppet/confdroid_selinux!6

Jenkinsfile

@@ -32,6 +32,7 @@ pipeline {
                 git checkout -b jenkins-build-$BUILD_NUMBER
                 # Optionally merge master into jenkins to ensure compatibility
                 git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
+                ls -alh .
             '''
         }
       }