Cache::BaseCache::Canonicalize_Expiration_Time would not return absolute
timestamps, but seconds from now only. We must always add the current
time, or the timestamp would end up in the past.
Merge branch 'public/7.7' into public/7.8