* origin/topic/jazoff/gh-3268: Fix check for emailed notices Changes: Added a test-case printing email_delay_tokens to compare email vs non-email notice types. Previously, both notice types would have email delay tokens at that point in the flow.