Merge "Make jack_check_timestamp depend on setup-jack-server"