Merge "Fix logging.conf sample"