Fix secret key gen for machines w/o pwgen

Conflicts:
	upgrade/upgrade.sh