Merge "Cinder add ability to use global logging.conf"