Backport fix for time-goes-forward test. Fix bug 1267