Don't assume we are using timestamps for the syncstamp.

Bug: 12523
BFN
Merge branch 'master' into horde_5_2