o.c.alarm.beast time stamp format fix,   XYGraph pick from 3.x

Fixes #736 and #737