Merge "Stress runner friendly logging.conf.sample"