watch-address client-related changes; correction to generated src/test Makefile.am.