Combined settings and card#985

timja wants to merge 29 commits intojenkinsci:masterjenkinsci/credentials-plugin:masterfrom

timja:settings-with-cardtimja/credentials-plugin:settings-with-cardCopy head branch name to clipboard