Merge commit '9a4c650d458dcb545d911f8ec3dddd6d57006291' into staging

Merge branch 'bugfix_damien' into staging

Merge branch 'edge' into deploy

Merge branch 'edge' into deploy

KT-345: Updated search for shared users.

Committed by: Jarrett Jordaan

Reviewed by:

Removed my commented out code in solr core.

Committed by: Jarrett Jordaan

Reviewed by:

Memcache revert.

Committed by: Jarrett Jordaan

Reviewed by:

KT-346 : Refactored views. Moved user specific views to seperate files.

Committed by: Jarrett Jordaan

Reviewed by:

KT-345: Updated search for shared users.

Committed by: Jarrett Jordaan

Reviewed by:

Extract KT user data from LDAP results with shared function for both …

…mass

and single import.
Add comment with link to IBM example showing that either full dn or plain
text is valid for uid field.

Story/Branch/Issue: new_ldap_PT_4432338

Committed by: Paul Barrett