Merge tag '3.6.7' into develop

Release: 3.6.7
Preparation for new development cycle after release 3.6.7
Drop the use of Spamhaus checking the CBL.
Version bump 3.6.8-rc.1
Version bump 3.6.8
Merge branch 'release/3.6.8'