Fix for #8670

We should only update the wait timeout on mis-matched event if we had a timeout to begin with
Add regression test for #8670

Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
Merge pull request #18363 from jacksontj/2014.7

Fix for #8670