merge up to r468720 on svn trunk using "svn merge -r 462690:468720 https://svn.apache.org/repos/asf/spamassassin/trunk"

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/branches/check_plugin@468796 13f79535-47bb-0310-9956-ffa450edef68
68 files changed