Merge pull request #4239 from owncloud/decrypt_files_again

Enable user to decrypt files again after encryption app was disabled

diff --cc apps/files/js/files.js
Simple merge

diff --cc apps/files_encryption/tests/trashbin.php
Simple merge

diff --cc apps/files_encryption/tests/webdav.php
Simple merge