Merge "[DCAEGEN2] Use common.log template"