Merge "run_stress.py -h doesn't work without a connection"