saltstack/salt — pull request #18363 by jacksontj (2014-11-21 16:48:49+00:00)
Title: Fix for #8670

We should only update the wait timeout on mis-matched event if we had a timeout to begin with