Merged r4257 from trunk.
Merged r4256 from trunk.
Merged r4254 from trunk.
Merged r4249 from trunk.
Merged r4245 from trunk.
Merged r4241 from trunk.
Merged r4240 from trunk.
Merged r4238 from trunk.
Merged r4237 from trunk.
Add a label for user and group search fields. #6521
Contributed by Felix Schäfer
