Add test coverage for watcher rebuild message.
Merge pull request #422 from rjackson/test-watcher-build-change

Add test coverage for watcher rebuild message.