Hold runtime lock during stop and reduce timeout values across the board
#1621
| Job | Run time |
|---|---|
| 10m 38s | |
| 9m 58s | |
| 11m 15s | |
| 7m 5s | |
| 5m 45s | |
| 10m 5s | |
| 13m 40s | |
| 8m 47s | |
| 15m 46s | |
| 1h 32m 59s |