Hold runtime lock during stop and reduce timeout values across the board
#1628
| Job | Run time |
|---|---|
| 15m 22s | |
| 10m 49s | |
| 9m 45s | |
| 9m 39s | |
| 9m 36s | |
| 43s | |
| 7m 14s | |
| 5m 21s | |
| 4m 39s | |
| 1h 13m 8s |