Merge "Default to /tmp for scenario (create|get)_timestamp()"