Fixes token renewal when client is not the default

There was an option to renew tokens for a different client which
was a recipe for disaster. If the option was not set then it
became nil and got reset to be the default_client.
Make filename methods more robust

If client_name is nil, this does not error complaining about the `+`
method.
Merge branch '57363776_renew_with_wrong_client'