LDAP: Coypright info
LDAP: prepare settings for internal username attribute and clearing user mappings
LDAP: add settings for UUID override
LDAP: implement r+w for new settings
LDAP: better variable name
LDAP: implement UUID and internal username override
LDAP: Implement clear mappings functionality
LDAP: fix display of numerical display names
Merge branch 'master' into ldap_configurable_username_n_uuid
Add Contacts repo to CONTRIBUTING.md
Merge pull request #3366 from owncloud/contributing_add_contacts

Add Contacts repo to CONTRIBUTING.md
Fix finding mount in background watcher, fixes #3353
Add Compound property to avoid double escaping values.
fix for  SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
fix for losing mount point "/"
Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point

fix for disappearing root mount point on lib/files/filesystem.php
No unit test coverage reports for pgsql - this causes issues on Jenkins.
Merge pull request #3374 from owncloud/vobject_compound_property

Add Compound property to avoid double escaping values.
Merge branch 'master' into fix-3353
Merge pull request #3371 from owncloud/fix-3353

Fix finding mount in background watcher, fixes #3353