Ports of PR #8662 + PR #8664 from master, merged to v0.51 via PR #8676.

Validated on foundation testnet AN (access-001.devnet54) and foundation
mainnet AN (access-001.mainnet28) — clean shutdown in both cases,
systemd status=0 / Deactivated successfully.

Recommended for external Access Node operators.