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

use 3.2m1/types.yaml