FP avoidance tuning, new test rule, unblock a rule

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1635987 13f79535-47bb-0310-9956-ffa450edef68