Merge "More logging in CDM discovery service" into sc-dev