* Make sure Registrar.discard() removces any workflow state manager state
  associated with the token, and that this is flushed to SA.

* Adjust the email commands to the new IRegistrar API.

* Update the IRegistrar interface.

* Add IWorkflowStateManager.discard() and make `count` an attribute/property.

* Mark two tests as expected failures due to LP: #1444184.