first check if a private key exists, if not it is always a recovery szenario
Use non-empty defaults
Merge branch 'stable6' into backport-11211-stable6

Conflicts:
	config/config.sample.php