Use timeouts for WaitForStatus calls

[segrived]

Controller.WaitForStatus(status, timeout);