Merge "Create short lived ssh key for enable-ssh-admin.sh" into stable/pike