Perform user/group searches case-insensitively

Fixes I#27835.
Fix indentation
Merge branch '4.2/watcher-insensitive' into 4.2-trunk