Merge branch 'fix/include-external-users-in-user-search' of...

Merge branch 'fix/include-external-users-in-user-search' of https://gitlab.com/siemens/gitlab into fix/include-external-users-in-user-search

# Conflicts:
#	spec/finders/users_finder_spec.rb