Filter users by state, not email regex
Filter users by state, not email regex

Some users seem to have been manually archived (or archived with some
other email format) that doesn't match our regex. Let's be more generous
in how we search for archived users.

Also update the substring regexes to handle this other known date format
(yyyy_m_d).

alphagov/notifications-api,alphagov/notifications-api