Merge branch 'fix-local-curve-plot-datetime' into 'master'

Flint: Fix local timezome on the curve plot

Closes #3826 (closed)

See merge request !5541 (merged)

(cherry picked from commit afaea221)

91c827f5 Fix rendering of both elapse time and epoch