Fix up liberation

* Send user id over the wire
* Use the same keys as the liberation form does for things like storage format and archive type
* When searching for a suitable inbox, ignore deleted inboxes