Merge "Revert "Move dscv and ca_certs to config section service_clients""