Fix bootstrap when key name is not specified
Check whether server.key_name exists before using it
Bump revision to 0.6.1