allow set command to modify watcher args

Watcher command line arguments were not accessible via the set command. This PR adds that functionality and updates the unit test.

This request contains fixes based on comments in PR #629.