Merge "openrc: Group auth-related options together"