various rule and FP avoidance tweaks

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