changed master require to watch, and both to salt-master