If a subrule is in an if block, ensure it appears in an else block to avoid breaking dependent rules. Fix some rules depending on subrules in if blocks in other sandboxes so they don't break if the conditional check suppresses that subrule.

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