Improve honeypot spam protection. Bug 945476.
Merge pull request #1746 from jpetto/bug-945476-fraud-report-spam-protection

Improve honeypot spam protection. Bug 945476.