Make it simpler to restore client to public client

[Krolken]

with the swich_client_type it is easy to switch a public client into a management client.

But it is not doing the correct job when going from a management client to a public one.

We need to remove the encryption keys, otherwise the connection still thinks it is encrypted.

Since public and managment client is the most common one we should make the switch_client_type more general and then have separate methods for make_public and make_management to handle the standard cases ontop of switch_client_type