fix first time encryption after app was enabled
[tx-robot] updated from transifex
improved test
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
added users for tests
reformat code to meet coding guidelines
[tx-robot] updated from transifex
Merge branch 'master' into file_encryption_tests
Merge pull request #3496 from owncloud/file_encryption_tests

improved tests for files_encryption
Merge pull request #3481 from owncloud/firsttime_enc

fix first time encryption after app was enabled
Merge branch 'master' into file_encryption_util_is_error

Conflicts:
	apps/files_encryption/lib/util.php