Merge "Ensure rsync is installed for fernet rotation"