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

Sorry for that, caused because I've merged master with an older version (the test was originally written during 3.1...)