Francois Gouget : testbot/TestAgent: Unify support for the old and new Wait RPCs.