saltstack/salt — pull request #16648 by kiorky (2014-10-15 15:53:11+00:00)
Title: Proper handling of watch with onlyif/unless

This fixes #16647