Merge "Set an hour timeout per test." into oc-dev