… are two places that would require more challenging code changes: the storage path `core/master`, and its contents (the JSON-serialized EncodedKeyringtructure.)

# Conflicts:
#	physical/raft/raft.go
#	vault/core.go
#	vault/generate_root.go
#	vault/generate_root_recovery.go

# Conflicts:
#	vault/barrier.go
#	vault/barrier_aes_gcm.go
#	vault/barrier_test.go
#	vault/generate_root.go
#	vault/ha.go
#	vault/keyring.go
#	vault/rekey.go