scripts/bachroot: Populate the keyring.
Merge branch 'master' into unstable

Conflicts:
	scripts/bachroot