Avoid Database::encodeExpiry, when simple timestamp is given

Also remove wfTimestampNow because Database::timestamp will default to
now, when no param is given.

Change-Id: I0b065f4cdf67e1473548e641cf2864b4a2232ef8
Merge "Avoid Database::encodeExpiry, when simple timestamp is given"