Merge pull request #3558 from owncloud/files_encryption_check_private_key

apps/files_encryption/ajax/changeRecoveryPassword.php

apps/files_encryption/ajax/updatePrivateKeyPassword.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/files/error.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/js/settings-personal.js

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/session.php

apps/files_encryption/lib/stream.php

apps/files_encryption/lib/util.php

apps/files_encryption/settings-personal.php

apps/files_encryption/templates/invalid_private_key.php

apps/files_encryption/templates/settings-admin.php

apps/files_encryption/templates/settings-personal.php

apps/files_encryption/tests/crypt.php

apps/files_encryption/tests/share.php

core/lostpassword/controller.php

core/lostpassword/templates/lostpassword.php

settings/ajax/changepassword.php