Merge "API: Use ConvertibleTimestamp::setFakeTime for testing curtimestamp"