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

Auto-merge for build 26

See merge request puppet/confdroid_ssh!26

.gitignore

@@ -2,4 +2,5 @@
 Gemfile.lock
 FileList
 .scannerwork
-.vscode
+.vscode
+.puppet-lint.rc

Jenkinsfile

@@ -116,6 +116,7 @@ pipeline {
                   git branch -D jenkins-build-$BUILD_NUMBER
                   git rm -f Jenkinsfile
                   git rm -r --cached .vscode || echo "No .vscode to remove from git"
+                  git rm -r --cached .puppet-lint.rc || echo "No .puppet-lint.rc to remove from git"
                   git commit --amend --no-edit --allow-empty
                   git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_ssh.git
                   git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \