Increased control timeout time.
Increased control timeout time.

The self test ran for long enough that it was timing out. Doubling
the timeout for control messages solves this problem.

aschulm/battor,aschulm/battor,aschulm/battor,aschulm/battor