Changes to make things work with user-api-client and, subsequently, user-api

Forget the reversion messages, that was a quick way to be able to make this PR.

@jh-bate Can you look at this and make sure it makes sense to you?