waitUntil is resetting implicitWait

Right now, waitUntil() leaves implicitWait timeout in a zero'd out state on success. It was only restoring the prior state on failure. Includes test.