merge from master and updated LOG() macro use
merge from master and updated LOG() macro use

ess-dmsc/event-formation-unit,ess-dmsc/event-formation-unit,ess-dmsc/event-formation-unit,ess-dmsc/event-formation-unit