Improvements to Secret Storage, esp around key generation
Better handle the case where we have an existing secret storage key already on the server, eg from Circles Android
Better handle the case where we have an existing secret storage key already on the server, eg from Circles Android