Merge "Enable logging.conf & fluentd for heat"