make serve timeout and watch timeout tunable

for #1551