Issue #1939660 by chx | catch: Use YAML as the primary means for service registration.