Cfy 54 unify @timestamp and timestamp fields in log/event messages

use '{0}:{1}'.format()...