Add additional search by user or group and extra user fields in social search - refs #7344

This should use { } and be on 3 different lines, as per convention "Opening braces for control structures MUST go on the same line, and closing braces MUST go on the next line after the body." of https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md