Improve honeypot spam protection. Bug 945476.

Improvements to the honeypot while we work on other tactics...