Add all attributes that are supplied, rather than piecemeal

This allows for greater extensibility.  At the same time, bullet-proof
the keys and values to prevent possible future security vulnerabilities;
while at current the keys and values are static and not generated based
on any user input, this prevents callbacks from unintentionally opening
up such vulnerabilities.
Autocomplete group names for watcher group searching
Merge branch '4.2/autocomplete-watcher-group'