Merge "Backup and restore of Salt master's state: pki and generated metadata"