* commit 'f25a35a1c98d4fac118ee9abe34d6bbf2d3a2201': Break key installation into its own function so we can install non-master keys.