improved error messaging, initial commit
encryption error messages, distinguish between a re-enabled encryption app and a password change from outside
improved documentation of the methods
error.php no longer needed
Merge branch 'master' into encryption_improved_error_messages_4617
re-added error.php
no longer enforce log out, but provide useful errors/warnings instead
remove test code
Merge branch 'master' into encryption_improved_error_messages_4617

Conflicts:
	apps/files/index.php
let user repeat the recovery key password to prevent typos
remove debug output
remove spaces
Merge branch 'master' into encryption_improved_error_messages_4617

Conflicts:
	settings/ajax/changepassword.php
revert changes to 3rdparty submodule
Resolve merge conflict
LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing
LDAP: move is_resource check to ldap wrapper to make it mockable
LDAP: establish wrapper interface to allow proper mocking
LDAP: add phpdoc
LDAP: use wrapper,  not direct function call