Merge "Add CephConfigOverrides to allow arbitrary configs in ceph.conf" into stable...