merged latest changes from trunk using: 'svn merge -r 602889:613114 https://svn.apache.org/repos/asf/spamassassin/trunk'

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/branches/bug-5293-pluginized-bayes@613117 13f79535-47bb-0310-9956-ffa450edef68
46 files changed