Fixes #3839: add display name for Oracle/Scientific Linux
Merge pull request #294 from fanf/bug_3839/dispay_name_in_search_for_oracle_and_scientific_linux

Fixes #3839: add display name for Oracle/Scientific Linux
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-web/src/main/resources/ldapObjectAndAttributes.properties
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge branch 'branches/rudder/2.7'