LDAP: fix handling when LDAP Host is offline
LDAP: fix possible recursion
fix login errors while filesystem is not loaded
Merge branch 'master' into files_encryption_fs_loaded_fix
also fix login errors while filesystem is not loaded in app.php
Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix

fix login errors while filesystem is not loaded
Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling

Fix ldap offline host handling
Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
	apps/files_encryption/appinfo/app.php