Bug 974869 - rewrite watch pending to cope better with spot requests that aren't being fulfilled