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

fixed